Commit aee230d7 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



mtp: linux guest detection fix

# gpg: Signature made Fri 11 Jul 2014 11:32:20 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-20140711-1:
  mtp: linux guest detection fix.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 42ca32f7 13d54125

hw/usb/dev-mtp.c

+4 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ enum { 
    STR_MANUFACTURER = 1,

    STR_PRODUCT,

    STR_SERIALNUMBER,

    STR_MTP,

    STR_CONFIG_FULL,

    STR_CONFIG_HIGH,

    STR_CONFIG_SUPER,
@@ -154,6 +155,7 @@ static const USBDescStrings desc_strings = { 
    [STR_MANUFACTURER] = MTP_MANUFACTURER,

    [STR_PRODUCT]      = MTP_PRODUCT,

    [STR_SERIALNUMBER] = "34617",

    [STR_MTP]          = "MTP",

    [STR_CONFIG_FULL]  = "Full speed config (usb 1.1)",

    [STR_CONFIG_HIGH]  = "High speed config (usb 2.0)",

    [STR_CONFIG_SUPER] = "Super speed config (usb 3.0)",
@@ -165,6 +167,7 @@ static const USBDescIface desc_iface_full = { 
    .bInterfaceClass               = USB_CLASS_STILL_IMAGE,

    .bInterfaceSubClass            = 0x01,

    .bInterfaceProtocol            = 0x01,

    .iInterface                    = STR_MTP,

    .eps = (USBDescEndpoint[]) {

        {

            .bEndpointAddress      = USB_DIR_IN | EP_DATA_IN,
@@ -206,6 +209,7 @@ static const USBDescIface desc_iface_high = { 
    .bInterfaceClass               = USB_CLASS_STILL_IMAGE,

    .bInterfaceSubClass            = 0x01,

    .bInterfaceProtocol            = 0x01,

    .iInterface                    = STR_MTP,

    .eps = (USBDescEndpoint[]) {

        {

            .bEndpointAddress      = USB_DIR_IN | EP_DATA_IN,