openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtp: linux guest detection fix 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTv700AAoJEEy22O7T6HE4q5MQANaXoHxzlCv5j5YHsdMcK/zU
 MHyvY92tzYFlw7B0SojqOegqkrFXmlKIXwBEK2hGuMczeD8f4mjwWrcBy8n+ZVi/
 uu8j2ageKppU1ucaGmlEYNE+wNZFZFTI6koGfRlBi8Aca9ixCPJGjLelxmxWzwRk
 abMk93Wt/e99FP2TQN1WH/B2dtKKlUFxd1YJIPLlB3sYxs9I4cVgAZ5YVzOxPUOU
 ESdSpfgQDZvL0jycaS4MXkJQNrvdhtscSfhUy/gp6MdHrrP8zIJbOdLb4+XMOipH
 FtclTrH3xZxJQg4ESsQv/sFTf5JgDSCr4xsd1yCWT2bFPeq24iJIgEArQM3RDgPY
 UJa+pzp2ioZ7gLCVpXxUolUoxvEGPwway000AqxhwRGvM4TCiYyQ/W31Pn4zMJc5
 W1UyE9n4hq6sr3FTa/kgzosBYdDHgQnz9kGSLEmzPCvpUQkmLjSPzVPS8id7ZCgn
 fz+0unJgHRM4xVVf6GMptSgG4nbaVU4WeQ7NwM5Kn0xrUd/VVzbqllq8PodpaRXT
 nYx+dVFFwoiDXRhBNTn3Z65vKN49sdMv9nCkTSqCIWxKRbqxfltoooHTSwBV5OL1
 v6VXTb5ZZOZweHK/qdli5InND1KF8aJa1w2IDt6xyIKtDfPuC1MqLzfXJuvGsfHz
 qU9KgU8XSx2kc0OuZ+fX
 =YT+T
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2014-07-11 16:01:38 +01:00
parent 42ca32f776 13d54125a3
commit aee230d707
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/usb/dev-mtp.c
View File

@ -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,