commit 142e895a1d5030a4e032f08fa5814ebd42b964b6
author Jean-Baptiste Queru <jbq@google.com> Fri Jan 27 14:00:21 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 27 14:00:21 2012 -0800
tree 571023da83640e12677fe5c6d01b8e4a70752327
parent 0c05409510037fd7372c3fe7ab240ebf33b15831
parent e83cd37e58b00fb6b9eb50464067864ca0cb2ff7

am e83cd37e: am 0458d373: Merge "fastboot: set the language local string"

* commit 'e83cd37e58b00fb6b9eb50464067864ca0cb2ff7':
  fastboot: set the language local string

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index e34cd02..5d8a831 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -119,6 +119,12 @@
 #define VENDOR_ID_LUMIGON       0x25E3
 //Intel's USB Vendor ID
 #define VENDOR_ID_INTEL         0x8087
+// Quanta's USB Vendor ID
+#define VENDOR_ID_QUANTA        0x0408
+// INQ Mobile's USB Vendor ID
+#define VENDOR_ID_INQ_MOBILE    0x2314
+// Sony's USB Vendor ID
+#define VENDOR_ID_SONY          0x054C
 
 /** built-in vendor list */
 int builtInVendorIds[] = {
@@ -164,6 +170,9 @@
     VENDOR_ID_FUJITSU,
     VENDOR_ID_LUMIGON,
     VENDOR_ID_INTEL,
+    VENDOR_ID_QUANTA,
+    VENDOR_ID_INQ_MOBILE,
+    VENDOR_ID_SONY,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))

fastboot/fastboot.c

diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index fe0af7a..fb7ac4d 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -158,6 +158,7 @@
        (info->dev_vendor != 0x22b8) &&  // Motorola
        (info->dev_vendor != 0x0955) &&  // Nvidia
        (info->dev_vendor != 0x413c) &&  // DELL
+       (info->dev_vendor != 0x2314) &&  // INQ Mobile
        (info->dev_vendor != 0x0bb4))    // HTC
             return -1;
     if(info->ifc_class != 0xff) return -1;