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

Commit c5cacda5 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 847ec9a8: Merge "More Mac fastboot failure debugging." 

* commit '847ec9a8':
  More Mac fastboot failure debugging.
parents c1b6378d 847ec9a8

fastboot/usb_osx.cpp

+2 −3
Original line number Original line Diff line number Diff line
@@ -75,7 +75,6 @@ static int try_interfaces(IOUSBDeviceInterface182 **dev, usb_handle *handle) { 
    HRESULT result;

    HRESULT result;

    SInt32 score;

    SInt32 score;

    UInt8 interfaceNumEndpoints;

    UInt8 interfaceNumEndpoints;

    UInt8 endpoint;

    UInt8 configuration;

    UInt8 configuration;





    // Placing the constant KIOUSBFindInterfaceDontCare into the following

    // Placing the constant KIOUSBFindInterfaceDontCare into the following
@@ -182,7 +181,7 @@ static int try_interfaces(IOUSBDeviceInterface182 **dev, usb_handle *handle) { 




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

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

        // are any that do bulk in/out.

        // are any that do bulk in/out.

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

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

            UInt8   transferType;

            UInt8   transferType;

            UInt16  maxPacketSize;

            UInt16  maxPacketSize;

            UInt8   interval;

            UInt8   interval;
@@ -210,7 +209,7 @@ static int try_interfaces(IOUSBDeviceInterface182 **dev, usb_handle *handle) { 
                    handle->zero_mask = maxPacketSize - 1;

                    handle->zero_mask = maxPacketSize - 1;

                }

                }

            } else {

            } else {

                ERR("could not get pipe properties (%08x)\n", kr);

                ERR("could not get pipe properties for endpoint %u (%08x)\n", endpoint, kr);

            }

            }





            if (handle->info.has_bulk_in && handle->info.has_bulk_out) {

            if (handle->info.has_bulk_in && handle->info.has_bulk_out) {