ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 2416b832: am 15c6de75: Merge "Start iterating USB pipe endpoints from 1."

Browse source 
* commit '2416b8320cdce59ae267d60d89b0ef96de6a9d95':
  Start iterating USB pipe endpoints from 1.
This commit is contained in:
Elliott Hughes 2015-08-14 03:21:47 +00:00 • committed by Android Git Automerger
commit 2733c14232
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
adb/usb_osx.cpp
View file

@ -316,11 +316,10 @@ static bool ClearPipeStallBothEnds(IOUSBInterfaceInterface190** interface, UInt8
static usb_handle* static usb_handle*
CheckInterface(IOUSBInterfaceInterface190 **interface, UInt16 vendor, UInt16 product) CheckInterface(IOUSBInterfaceInterface190 **interface, UInt16 vendor, UInt16 product)
{ {
usb_handle* handle = NULL; usb_handle* handle;
IOReturn kr; IOReturn kr;
UInt8 interfaceNumEndpoints, interfaceClass, interfaceSubClass, interfaceProtocol; UInt8 interfaceNumEndpoints, interfaceClass, interfaceSubClass, interfaceProtocol;
UInt8 endpoint; UInt8 endpoint;
//* Now open the interface. This will cause the pipes associated with //* Now open the interface. This will cause the pipes associated with
//* the endpoints in the interface descriptor to be instantiated //* the endpoints in the interface descriptor to be instantiated
@ -356,7 +355,7 @@ CheckInterface(IOUSBInterfaceInterface190 **interface, UInt16 vendor, UInt16 pro
//* Iterate over the endpoints for this interface and find the first //* Iterate over the endpoints for this interface and find the first
//* bulk in/out pipes available. These will be our read/write pipes. //* 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; UInt8 transferType;
UInt16 maxPacketSize; UInt16 maxPacketSize;
UInt8 interval; UInt8 interval;

2
fastboot/usb_osx.cpp
View file

@ -181,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 (UInt8 endpoint = 0; endpoint <= interfaceNumEndpoints; endpoint++) { for (UInt8 endpoint = 1; endpoint <= interfaceNumEndpoints; endpoint++) {
UInt8 transferType; UInt8 transferType;
UInt16 maxPacketSize; UInt16 maxPacketSize;
UInt8 interval; UInt8 interval;