aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2012-01-24 11:29:50 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-24 11:29:50 -0800
commit0c05409510037fd7372c3fe7ab240ebf33b15831 (patch)
treecaa494c517fb0c01e62b08fcef7381017654666f
parent70580b20bc8485002df0b3e89e42754c8c9796ff (diff)
parent746f3243f6d30ab51a36dcfea76eac3ba29ac625 (diff)
downloadsystem_core-0c05409510037fd7372c3fe7ab240ebf33b15831.zip
system_core-0c05409510037fd7372c3fe7ab240ebf33b15831.tar.gz
system_core-0c05409510037fd7372c3fe7ab240ebf33b15831.tar.bz2
am 746f3243: Add USB vendor IDs for Quanta, INQ and Sony.
* commit '746f3243f6d30ab51a36dcfea76eac3ba29ac625': Add USB vendor IDs for Quanta, INQ and Sony.
-rw-r--r--adb/usb_vendors.c9
-rw-r--r--fastboot/fastboot.c1
2 files changed, 10 insertions, 0 deletions
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 @@ int builtInVendorIds[] = {
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]))
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 @@ int match_fastboot(usb_ifc_info *info)
(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;