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.
This commit is contained in:
Jean-Baptiste Queru 2011-07-14 10:49:22 -07:00 committed by Android Git Automerger
commit 7076831c7d
1 changed files with 9 additions and 0 deletions

View File

@ -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]))