diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-07-12 14:41:21 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2011-07-12 14:41:38 -0700 |
| commit | f75a2ed2138cd8b74597bd57e13d12e1f0b815c2 (patch) | |
| tree | d6750e9636bf91d6de8ed967b7e4f13e29626272 /adb | |
| parent | 436deea5bbd43ae402ca8ee5bbc7fed3daaf3fce (diff) | |
| parent | a38ec2b7d4324965d55a020baf4ad8b979d69597 (diff) | |
| download | system_core-f75a2ed2138cd8b74597bd57e13d12e1f0b815c2.tar.gz system_core-f75a2ed2138cd8b74597bd57e13d12e1f0b815c2.tar.bz2 system_core-f75a2ed2138cd8b74597bd57e13d12e1f0b815c2.zip | |
Merge from gingerbread-plus-aosp
Change-Id: I55b84eda30edf0eade8b43712ab011cd3f65f0d9
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/usb_vendors.c | 9 | ||||
| -rw-r--r-- | adb/usb_vendors.h | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c index 1ab51006..28ba80db 100644 --- a/adb/usb_vendors.c +++ b/adb/usb_vendors.c @@ -91,6 +91,12 @@ #define VENDOR_ID_FUNAI 0x0F1C // Gigabyte's USB Vendor ID #define VENDOR_ID_GIGABYTE 0x0414 +// IRiver's USB Vendor ID +#define VENDOR_ID_IRIVER 0x2420 +// Compal's USB Vendor ID +#define VENDOR_ID_COMPAL 0x1219 +// T & A Mobile Phones' USB Vendor ID +#define VENDOR_ID_T_AND_A 0x1BBB /** built-in vendor list */ @@ -123,6 +129,9 @@ int builtInVendorIds[] = { VENDOR_ID_TI, VENDOR_ID_FUNAI, VENDOR_ID_GIGABYTE, + VENDOR_ID_IRIVER, + VENDOR_ID_COMPAL, + VENDOR_ID_T_AND_A, }; #define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0])) diff --git a/adb/usb_vendors.h b/adb/usb_vendors.h index 43790b90..cee23a15 100644 --- a/adb/usb_vendors.h +++ b/adb/usb_vendors.h @@ -22,4 +22,4 @@ extern unsigned vendorIdCount; void usb_vendors_init(void); -#endif
\ No newline at end of file +#endif |