diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-09 23:44:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 23:44:45 +0000 |
| commit | 58cd6d35739a955872f51373776e6bf4563cdd34 (patch) | |
| tree | 15c9345e2b3e2546f8b2d074689326b5eb05dd1c /fastboot | |
| parent | a3edb7e62e0ebd42382b867bbddc6cfb9ff0dcac (diff) | |
| parent | 7da97265e596fc1bb112a4b2aa939057fef18fcb (diff) | |
| download | system_core-58cd6d35739a955872f51373776e6bf4563cdd34.zip system_core-58cd6d35739a955872f51373776e6bf4563cdd34.tar.gz system_core-58cd6d35739a955872f51373776e6bf4563cdd34.tar.bz2 | |
am 7da97265: am ab0d5425: Merge "fastboot: Support USB 3.x SuperSpeed devices on Linux"
* commit '7da97265e596fc1bb112a4b2aa939057fef18fcb':
fastboot: Support USB 3.x SuperSpeed devices on Linux
Diffstat (limited to 'fastboot')
| -rw-r--r-- | fastboot/usb_linux.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fastboot/usb_linux.c b/fastboot/usb_linux.c index fabbd51..022f364 100644 --- a/fastboot/usb_linux.c +++ b/fastboot/usb_linux.c @@ -223,6 +223,13 @@ static int filter_usb_device(char* sysfs_name, } else { out = ept->bEndpointAddress; } + + // For USB 3.0 devices skip the SS Endpoint Companion descriptor + if (check((struct usb_descriptor_hdr *)ptr, len, + USB_DT_SS_ENDPOINT_COMP, USB_DT_SS_EP_COMP_SIZE) == 0) { + len -= USB_DT_SS_EP_COMP_SIZE; + ptr += USB_DT_SS_EP_COMP_SIZE; + } } info.has_bulk_in = (in != -1); |