openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am de6f62a6: Add support for Samsung and Motorola devices. 

Merge commit 'de6f62a609120c3d9e4e53689c3b309842ec874b'

* commit 'de6f62a609120c3d9e4e53689c3b309842ec874b':
  Add support for Samsung and Motorola devices.
This commit is contained in:
Xavier Ducrohet 2009-07-24 16:09:22 -07:00 committed by Android Git Automerger
parent d39e972831 de6f62a609
commit 1fde31c8fb
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
adb/usb_linux.c
View File

@ -318,9 +318,13 @@ static int find_usb_device(const char *base,
found_device = 1;
break;
} else {
// skip to next interface
bufptr += (interface->bNumEndpoints * USB_DT_ENDPOINT_SIZE);
}
// seek next interface descriptor
if (i < interfaces - 1) {
while (bufptr[1] != USB_DT_INTERFACE) {
bufptr += bufptr[0];
}
}
}
} // end of for
adb_close(fd);

6
adb/usb_vendors.c
View File

@ -39,11 +39,17 @@
#define VENDOR_ID_GOOGLE 0x18d1
// HTC's USB Vendor ID
#define VENDOR_ID_HTC 0x0bb4
// Samsung's USB Vendor ID
#define VENDOR_ID_SAMSUNG 0x04e8
// Motorola's USB Vendor ID
#define VENDOR_ID_MOTOROLA 0x22b8
/** built-in vendor list */
int builtInVendorIds[] = {
VENDOR_ID_GOOGLE,
VENDOR_ID_HTC,
VENDOR_ID_SAMSUNG,
VENDOR_ID_MOTOROLA,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))