Commit 0e96643c authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-5' into staging 



usb: mtp filesharing

# gpg: Signature made Wed 23 Apr 2014 09:28:37 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-usb-5:
  usb: mtp filesharing
  usb: add CompatibleID support to msos

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ad600a4d 840a178c

default-configs/usb.mak

+1 −0
Original line number Diff line number Diff line 
CONFIG_USB_TABLET_WACOM=y

CONFIG_USB_STORAGE_BOT=y

CONFIG_USB_STORAGE_UAS=y

CONFIG_USB_STORAGE_MTP=y

CONFIG_USB_SMARTCARD=y

CONFIG_USB_AUDIO=y

CONFIG_USB_SERIAL=y

hw/usb/Makefile.objs

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ common-obj-y += ccid-card-passthru.o 
common-obj-$(CONFIG_SMARTCARD_NSS)    += ccid-card-emulated.o

endif



ifeq ($(CONFIG_POSIX),y)

common-obj-$(CONFIG_USB_STORAGE_MTP)  += dev-mtp.o

endif



# usb redirection

common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o

hw/usb/desc-msos.c

+5 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ typedef struct msos_compat_hdr { 
typedef struct msos_compat_func {

    uint8_t  bFirstInterfaceNumber;

    uint8_t  reserved_1;

    uint8_t  compatibleId[8];

    char     compatibleId[8];

    uint8_t  subCompatibleId[8];

    uint8_t  reserved_2[6];

} QEMU_PACKED msos_compat_func;
@@ -59,6 +59,10 @@ static int usb_desc_msos_compat(const USBDesc *desc, uint8_t *dest) 
    func = (void *)(dest + length);

    func->bFirstInterfaceNumber = 0;

    func->reserved_1 = 0x01;

    if (desc->msos->CompatibleID) {

        snprintf(func->compatibleId, sizeof(func->compatibleId),

                 "%s", desc->msos->CompatibleID);

    }

    length += sizeof(*func);

    count++;

hw/usb/desc.h

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ struct USBDescOther { 
};



struct USBDescMSOS {

    const char                *CompatibleID;

    const wchar_t             *Label;

    bool                      SelectiveSuspendEnabled;

};

hw/usb/dev-mtp.c

0 → 100644
+1103 −0

File added.

Preview size limit exceeded, changes collapsed.