Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbb7c46d authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "ADB on linux: Handle USB SuperSpeed extra Descriptors"

parents a5e9b065 58b01e01

adb/usb_linux.c

+12 −0
Original line number Diff line number Diff line
@@ -237,8 +237,20 @@ static void find_usb_device(const char *base, 
                            // looks like ADB...

                        ep1 = (struct usb_endpoint_descriptor *)bufptr;

                        bufptr += USB_DT_ENDPOINT_SIZE;

                            // For USB 3.0 SuperSpeed devices, skip potential

                            // USB 3.0 SuperSpeed Endpoint Companion descriptor

                        if (bufptr+2 <= devdesc + desclength &&

                            bufptr[0] == USB_DT_SS_EP_COMP_SIZE &&

                            bufptr[1] == USB_DT_SS_ENDPOINT_COMP) {

                            bufptr += USB_DT_SS_EP_COMP_SIZE;

                        }

                        ep2 = (struct usb_endpoint_descriptor *)bufptr;

                        bufptr += USB_DT_ENDPOINT_SIZE;

                        if (bufptr+2 <= devdesc + desclength &&

                            bufptr[0] == USB_DT_SS_EP_COMP_SIZE &&

                            bufptr[1] == USB_DT_SS_ENDPOINT_COMP) {

                            bufptr += USB_DT_SS_EP_COMP_SIZE;

                        }



                        if (bufptr > devdesc + desclength ||

                            ep1->bLength != USB_DT_ENDPOINT_SIZE ||