commit 5f8d9c012cf28fad57d0896b938b05e2c976073f
author Elliott Hughes <enh@google.com> Mon Jun 17 20:47:18 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 17 20:47:18 2013 +0000
tree 0f2f6f474e7a196eb7f44a80d279681c7f7a6706
parent c620f095fef62114ffdc6c0ed0749c56b5e817b8
parent 71150ce4efdaba3d60cb39ed085b3476969ab95e

Merge "adb: add vendor ID's for Nook, Haier, Hisense, and MTK"

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 698f8a9..ed53abc 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -143,6 +143,14 @@
 #define VENDOR_ID_BYD           0x19D1
 // OUYA's USB Vendor ID
 #define VENDOR_ID_OUYA          0x2836
+// Haier's USB Vendor ID
+#define VENDOR_ID_HAIER         0x201E
+// Hisense's USB Vendor ID
+#define VENDOR_ID_HISENSE       0x109b
+// MTK's USB Vendor ID
+#define VENDOR_ID_MTK           0x0e8d
+// B&N Nook's USB Vendor ID
+#define VENDOR_ID_NOOK          0x2080
 
 
 /** built-in vendor list */
@@ -201,6 +209,10 @@
     VENDOR_ID_XIAOMI,
     VENDOR_ID_BYD,
     VENDOR_ID_OUYA,
+    VENDOR_ID_HAIER,
+    VENDOR_ID_HISENSE,
+    VENDOR_ID_MTK,
+    VENDOR_ID_NOOK,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))