am cc39d421: am 936032b4: Merge "Add USB Vendor ID for MSI"

* commit 'cc39d421ea5f449d5e201dd1ada7b2a12acf5ad9': Add USB Vendor ID for MSI
2013-08-12 10:34:58 -07:00 · 2013-08-12 10:34:58 -07:00 · 49f2e1cedf
parent 57fd0989cb cc39d421ea
commit 49f2e1cedf
1 changed files with 3 additions and 0 deletions
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@ -155,6 +155,8 @@
 #define VENDOR_ID_QISDA         0x1D45
 // ECS's USB Vendor ID
 #define VENDOR_ID_ECS           0x03fc
+// MSI's USB Vendor ID
+#define VENDOR_ID_MSI           0x1462


 /** built-in vendor list */
@ -219,6 +221,7 @@ int builtInVendorIds[] = {
    VENDOR_ID_NOOK,
    VENDOR_ID_QISDA,
    VENDOR_ID_ECS,
+    VENDOR_ID_MSI,
 };

 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))