diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-07-14 10:49:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-14 10:49:22 -0700 |
| commit | 7076831c7d59d96e9b75bf9aa5664d1d1b312f32 (patch) | |
| tree | 030a095e68df4a663852fadfca303591efa21019 | |
| parent | e877ad7ae3ea3c1a631652c86887a627ef9feb3f (diff) | |
| parent | f75a2ed2138cd8b74597bd57e13d12e1f0b815c2 (diff) | |
| download | system_core-7076831c7d59d96e9b75bf9aa5664d1d1b312f32.zip system_core-7076831c7d59d96e9b75bf9aa5664d1d1b312f32.tar.gz system_core-7076831c7d59d96e9b75bf9aa5664d1d1b312f32.tar.bz2 | |
am f75a2ed2: Merge from gingerbread-plus-aosp
* commit 'f75a2ed2138cd8b74597bd57e13d12e1f0b815c2':
adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones
Add Gigabyte's USB vendor ID to adb.
Add Funai's USB vendor ID to adb.
| -rw-r--r-- | adb/usb_vendors.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c index 1ab5100..28ba80d 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])) |