diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-07-11 16:01:38 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-07-11 16:01:38 +0100 |
| commit | aee230d707155a957c8300ee12049377d3ffebef (patch) | |
| tree | c8af3afeed7adc2b51eb6f0c52efc1bd2fdb1f1d | |
| parent | 42ca32f776c364c6a4c10d7100505b00b7a7f14e (diff) | |
| parent | 13d54125a3482a5837682499d25f6be10aa824be (diff) | |
| download | qemu-aee230d707155a957c8300ee12049377d3ffebef.zip qemu-aee230d707155a957c8300ee12049377d3ffebef.tar.gz qemu-aee230d707155a957c8300ee12049377d3ffebef.tar.bz2 | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/usb/dev-mtp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 380b465..1b51a90 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -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, |