am 4c6b494a: Merge "adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones"

* commit '4c6b494a109186791bfc421bc10f35eaae871174':
  adb: Add vendor IDs for iRiver, Compal and T & A Mobile Phones
This commit is contained in:
Mike Lockwood 2011-07-12 11:59:31 -07:00 committed by Android Git Automerger
commit a38ec2b7d4
2 changed files with 10 additions and 1 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]))

View file

@ -22,4 +22,4 @@ extern unsigned vendorIdCount;
void usb_vendors_init(void);
#endif
#endif