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

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

Merge "Start iterating USB pipe endpoints from 1."

parents 782daf89 2d4f852d

adb/usb_osx.cpp

+5 −6
Original line number Diff line number Diff line
@@ -316,12 +316,11 @@ static bool ClearPipeStallBothEnds(IOUSBInterfaceInterface190** interface, UInt8 
static usb_handle*

CheckInterface(IOUSBInterfaceInterface190 **interface, UInt16 vendor, UInt16 product)

{

    usb_handle*                 handle = NULL;

    usb_handle* handle;

    IOReturn kr;

    UInt8 interfaceNumEndpoints, interfaceClass, interfaceSubClass, interfaceProtocol;

    UInt8 endpoint;





    //* Now open the interface.  This will cause the pipes associated with

    //* the endpoints in the interface descriptor to be instantiated

    kr = (*interface)->USBInterfaceOpen(interface);
@@ -356,7 +355,7 @@ CheckInterface(IOUSBInterfaceInterface190 **interface, UInt16 vendor, UInt16 pro 


    //* Iterate over the endpoints for this interface and find the first

    //* bulk in/out pipes available.  These will be our read/write pipes.

    for (endpoint = 0; endpoint <= interfaceNumEndpoints; endpoint++) {

    for (endpoint = 1; endpoint <= interfaceNumEndpoints; endpoint++) {

        UInt8   transferType;

        UInt16  maxPacketSize;

        UInt8   interval;

fastboot/usb_osx.cpp

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static int try_interfaces(IOUSBDeviceInterface182 **dev, usb_handle *handle) { 


        // Iterate over the endpoints for this interface and see if there

        // are any that do bulk in/out.

        for (UInt8 endpoint = 0; endpoint <= interfaceNumEndpoints; endpoint++) {

        for (UInt8 endpoint = 1; endpoint <= interfaceNumEndpoints; endpoint++) {

            UInt8   transferType;

            UInt16  maxPacketSize;

            UInt8   interval;