commit a38ec2b7d4324965d55a020baf4ad8b979d69597
author Mike Lockwood <lockwood@android.com> Tue Jul 12 11:59:31 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 12 11:59:31 2011 -0700
tree 8f2afbd8b76c72f32fc5f74b30ca6610c226133b
parent 7da2397583445a263fcad23f548951d13cf3b4bb
parent 4c6b494a109186791bfc421bc10f35eaae871174

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

adb/usb_vendors.c

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

adb/usb_vendors.h

diff --git a/adb/usb_vendors.h b/adb/usb_vendors.h
index 43790b9..cee23a1 100644
--- a/adb/usb_vendors.h
+++ b/adb/usb_vendors.h
@@ -22,4 +22,4 @@
 
 void usb_vendors_init(void);
 
-#endif
\ No newline at end of file
+#endif