diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-09 14:40:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 14:40:58 +0000 |
| commit | 7da97265e596fc1bb112a4b2aa939057fef18fcb (patch) | |
| tree | bcc5c9254f1f60dbac284af73884ae42d672f76f /fastboot | |
| parent | c6e34ed6f9dc6ae615563a8adc80462adcc8d9d5 (diff) | |
| parent | ab0d542506b5fdbcc431ba2606248471d22322ba (diff) | |
| download | system_core-7da97265e596fc1bb112a4b2aa939057fef18fcb.zip system_core-7da97265e596fc1bb112a4b2aa939057fef18fcb.tar.gz system_core-7da97265e596fc1bb112a4b2aa939057fef18fcb.tar.bz2 | |
am ab0d5425: Merge "fastboot: Support USB 3.x SuperSpeed devices on Linux"
* commit 'ab0d542506b5fdbcc431ba2606248471d22322ba':
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); |