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

* commit '49f2e1cedfcf1dac72efe6e3634a3cd2db299e30': Add USB Vendor ID for MSI
2013-12-05 19:46:12 +00:00 · 2013-12-05 19:46:12 +00:00 · f183a42fb3
parent 479efb540a 49f2e1cedf
commit f183a42fb3
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]))