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

Commit ba7284ae authored by Siva Velusamy's avatar Siva Velusamy Committed by Android Git Automerger
Browse files

am 4d40c03b: Merge "adb: On Mac, clear both host and device endpoints at startup" 

* commit '4d40c03b':
  adb: On Mac, clear both host and device endpoints at startup
parents e1c3a7c1 4d40c03b

adb/usb_osx.cpp

+36 −22
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ struct usb_handle 
{

{

    UInt8 bulkIn;

    UInt8 bulkIn;

    UInt8 bulkOut;

    UInt8 bulkOut;

    IOUSBInterfaceInterface   **interface;

    IOUSBInterfaceInterface190** interface;

    io_object_t usbNotification;

    io_object_t usbNotification;

    unsigned int zero_mask;

    unsigned int zero_mask;

};

};
@@ -59,7 +59,7 @@ static void AndroidInterfaceAdded(void *refCon, io_iterator_t iterator); 
static void AndroidInterfaceNotify(void *refCon, io_iterator_t iterator,

static void AndroidInterfaceNotify(void *refCon, io_iterator_t iterator,

                                   natural_t messageType,

                                   natural_t messageType,

                                   void *messageArgument);

                                   void *messageArgument);

static usb_handle* CheckInterface(IOUSBInterfaceInterface **iface,

static usb_handle* CheckInterface(IOUSBInterfaceInterface190 **iface,

                                  UInt16 vendor, UInt16 product);

                                  UInt16 vendor, UInt16 product);





static int

static int
@@ -256,7 +256,7 @@ AndroidInterfaceAdded(void *refCon, io_iterator_t iterator) 
        DBG("INFO: Found vid=%04x pid=%04x serial=%s\n", vendor, product,

        DBG("INFO: Found vid=%04x pid=%04x serial=%s\n", vendor, product,

            serial);

            serial);





        usb_handle* handle = CheckInterface((IOUSBInterfaceInterface**)iface,

        usb_handle* handle = CheckInterface((IOUSBInterfaceInterface190**)iface,

                                            vendor, product);

                                            vendor, product);

        if (handle == NULL) {

        if (handle == NULL) {

            DBG("ERR: Could not find device interface: %08x\n", kr);

            DBG("ERR: Could not find device interface: %08x\n", kr);
@@ -299,10 +299,22 @@ AndroidInterfaceNotify(void *refCon, io_service_t service, natural_t messageType 
    }

    }

}

}





// Used to clear both the endpoints before starting.

// When adb quits, we might clear the host endpoint but not the device.

// So we make sure both sides are clear before starting up.

static bool ClearPipeStallBothEnds(IOUSBInterfaceInterface190** interface, UInt8 bulkEp) {

    IOReturn rc = (*interface)->ClearPipeStallBothEnds(interface, bulkEp);

    if (rc != kIOReturnSuccess) {

        DBG("ERR: Could not clear pipe: (%08x)\n",  rc);

        return false;

    }

    return true;

}



//* TODO: simplify this further since we only register to get ADB interface

//* TODO: simplify this further since we only register to get ADB interface

//* subclass+protocol events

//* subclass+protocol events

static usb_handle*

static usb_handle*

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

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

{

{

    usb_handle*                 handle = NULL;

    usb_handle*                 handle = NULL;

    IOReturn                    kr;

    IOReturn                    kr;
@@ -335,9 +347,9 @@ CheckInterface(IOUSBInterfaceInterface **interface, UInt16 vendor, UInt16 produc 




    //* check to make sure interface class, subclass and protocol match ADB

    //* check to make sure interface class, subclass and protocol match ADB

    //* avoid opening mass storage endpoints

    //* avoid opening mass storage endpoints

    if (!is_adb_interface(vendor, product, interfaceClass,

    if (!is_adb_interface(vendor, product, interfaceClass, interfaceSubClass, interfaceProtocol)) {

                interfaceSubClass, interfaceProtocol))

        goto err_bad_adb_interface;

        goto err_bad_adb_interface;

    }





    handle = reinterpret_cast<usb_handle*>(calloc(1, sizeof(usb_handle)));

    handle = reinterpret_cast<usb_handle*>(calloc(1, sizeof(usb_handle)));

    if (handle == nullptr) goto err_bad_adb_interface;

    if (handle == nullptr) goto err_bad_adb_interface;
@@ -353,22 +365,24 @@ CheckInterface(IOUSBInterfaceInterface **interface, UInt16 vendor, UInt16 produc 




        kr = (*interface)->GetPipeProperties(interface, endpoint, &direction,

        kr = (*interface)->GetPipeProperties(interface, endpoint, &direction,

                &number, &transferType, &maxPacketSize, &interval);

                &number, &transferType, &maxPacketSize, &interval);

        if (kr != kIOReturnSuccess) {

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

            goto err_get_pipe_props;

        }





        if (kIOReturnSuccess == kr) {

        if (kUSBBulk != transferType) continue;

            if (kUSBBulk != transferType)

                continue;





            if (kUSBIn == direction)

        if (kUSBIn == direction) {

            handle->bulkIn = endpoint;

            handle->bulkIn = endpoint;

            if (!ClearPipeStallBothEnds(interface, handle->bulkIn)) goto err_get_pipe_props;

        }





            if (kUSBOut == direction)

        if (kUSBOut == direction) {

            handle->bulkOut = endpoint;

            handle->bulkOut = endpoint;

            if (!ClearPipeStallBothEnds(interface, handle->bulkOut)) goto err_get_pipe_props;

        }





        handle->zero_mask = maxPacketSize - 1;

        handle->zero_mask = maxPacketSize - 1;

        } else {

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

            goto err_get_pipe_props;

        }

    }

    }





    handle->interface = interface;

    handle->interface = interface;