summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ducrohet2012-01-13 18:03:37 -0600
committerXavier Ducrohet2012-01-24 13:18:50 -0600
commit746f3243f6d30ab51a36dcfea76eac3ba29ac625 (patch)
treef80e778f7be71aa2cd26c4095b60ecd14431c609
parent4779e9344bb62208e4772ff6486b6df564f434b8 (diff)
downloadplatform-system-core-746f3243f6d30ab51a36dcfea76eac3ba29ac625.tar.gz
platform-system-core-746f3243f6d30ab51a36dcfea76eac3ba29ac625.tar.xz
platform-system-core-746f3243f6d30ab51a36dcfea76eac3ba29ac625.zip
Add USB vendor IDs for Quanta, INQ and Sony.android-cts-4.0.3_r2
Change-Id: I224e067d9a64e8e9e7afbad0760a4b07f965bf83
-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 a8b0ca208..d213dd919 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -117,6 +117,12 @@
117#define VENDOR_ID_LUMIGON 0x25E3 117#define VENDOR_ID_LUMIGON 0x25E3
118//Intel's USB Vendor ID 118//Intel's USB Vendor ID
119#define VENDOR_ID_INTEL 0x8087 119#define VENDOR_ID_INTEL 0x8087
120// Quanta's USB Vendor ID
121#define VENDOR_ID_QUANTA 0x0408
122// INQ Mobile's USB Vendor ID
123#define VENDOR_ID_INQ_MOBILE 0x2314
124// Sony's USB Vendor ID
125#define VENDOR_ID_SONY 0x054C
120 126
121/** built-in vendor list */ 127/** built-in vendor list */
122int builtInVendorIds[] = { 128int builtInVendorIds[] = {
@@ -161,6 +167,9 @@ int builtInVendorIds[] = {
161 VENDOR_ID_FUJITSU, 167 VENDOR_ID_FUJITSU,
162 VENDOR_ID_LUMIGON, 168 VENDOR_ID_LUMIGON,
163 VENDOR_ID_INTEL, 169 VENDOR_ID_INTEL,
170 VENDOR_ID_QUANTA,
171 VENDOR_ID_INQ_MOBILE,
172 VENDOR_ID_SONY,
164}; 173};
165 174
166#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0])) 175#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))
diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 4a2de2062..a069d339d 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -157,6 +157,7 @@ int match_fastboot(usb_ifc_info *info)
157 (info->dev_vendor != 0x22b8) && // Motorola 157 (info->dev_vendor != 0x22b8) && // Motorola
158 (info->dev_vendor != 0x0955) && // Nvidia 158 (info->dev_vendor != 0x0955) && // Nvidia
159 (info->dev_vendor != 0x413c) && // DELL 159 (info->dev_vendor != 0x413c) && // DELL
160 (info->dev_vendor != 0x2314) && // INQ Mobile
160 (info->dev_vendor != 0x0bb4)) // HTC 161 (info->dev_vendor != 0x0bb4)) // HTC
161 return -1; 162 return -1;
162 if(info->ifc_class != 0xff) return -1; 163 if(info->ifc_class != 0xff) return -1;