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

Commit bd6c6eb0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove useless arguments from is_adb_interface."

parents 09dac589 30186df0

adb/adb.h

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ void usb_kick(usb_handle *h); 


// USB device detection.

#if ADB_HOST

int is_adb_interface(int vid, int pid, int usb_class, int usb_subclass, int usb_protocol);

int is_adb_interface(int usb_class, int usb_subclass, int usb_protocol);

#endif



ConnectionState connection_state(atransport *t);

adb/transport_usb.cpp

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ void init_usb_transport(atransport *t, usb_handle *h, ConnectionState state) 
}



#if ADB_HOST

int is_adb_interface(int vid, int pid, int usb_class, int usb_subclass, int usb_protocol)

int is_adb_interface(int usb_class, int usb_subclass, int usb_protocol)

{

    return (usb_class == ADB_CLASS && usb_subclass == ADB_SUBCLASS && usb_protocol == ADB_PROTOCOL);

}

adb/usb_linux.cpp

+2 −3
Original line number Diff line number Diff line
@@ -205,9 +205,8 @@ static void find_usb_device(const std::string& base, 
                         interface->bInterfaceProtocol, interface->bNumEndpoints);



                    if (interface->bNumEndpoints == 2 &&

                            is_adb_interface(vid, pid, interface->bInterfaceClass,

                            interface->bInterfaceSubClass, interface->bInterfaceProtocol))  {



                        is_adb_interface(interface->bInterfaceClass, interface->bInterfaceSubClass,

                                         interface->bInterfaceProtocol)) {

                        struct stat st;

                        char pathbuf[128];

                        char link[256];

adb/usb_osx.cpp

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ CheckInterface(IOUSBInterfaceInterface190 **interface, UInt16 vendor, UInt16 pro 


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

    //* avoid opening mass storage endpoints

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

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

        goto err_bad_adb_interface;

    }

adb/usb_windows.cpp

+3 −4
Original line number Diff line number Diff line
@@ -553,9 +553,8 @@ int recognized_device(usb_handle* handle) { 
    return 0;

  }



  if (is_adb_interface(device_desc.idVendor, device_desc.idProduct,

      interf_desc.bInterfaceClass, interf_desc.bInterfaceSubClass, interf_desc.bInterfaceProtocol)) {



  if (is_adb_interface(interf_desc.bInterfaceClass, interf_desc.bInterfaceSubClass,

                       interf_desc.bInterfaceProtocol)) {

    if (interf_desc.bInterfaceProtocol == 0x01) {

      AdbEndpointInformation endpoint_info;

      // assuming zero is a valid bulk endpoint ID