summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-01-12 07:05:04 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-01-12 07:05:04 +0000
commite76343ef72458aff8fdc25c57f4e84407c05a2f2 (patch)
tree87d8ef622dc3d59f79e32d824ce15ca1605f9dd7 /adb
parent8387fc938e044a2bf2840139203af7f9b3884029 (diff)
parent6e39bace17ef089beb143f6324807b9d33df366c (diff)
downloadsystem_core-e76343ef72458aff8fdc25c57f4e84407c05a2f2.zip
system_core-e76343ef72458aff8fdc25c57f4e84407c05a2f2.tar.gz
system_core-e76343ef72458aff8fdc25c57f4e84407c05a2f2.tar.bz2
Merge "Emerson USB ID"
Diffstat (limited to 'adb')
-rwxr-xr-xadb/usb_vendors.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index f679a54..cd5885e 100755
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -58,6 +58,8 @@
#define VENDOR_ID_ECS 0x03fc
// EMERGING_TECH's USB Vendor ID
#define VENDOR_ID_EMERGING_TECH 0x297F
+// Emerson's USB Vendor ID
+#define VENDOR_ID_EMERSON 0x2207
// Foxconn's USB Vendor ID
#define VENDOR_ID_FOXCONN 0x0489
// Fujitsu's USB Vendor ID
@@ -192,6 +194,7 @@ int builtInVendorIds[] = {
VENDOR_ID_DELL,
VENDOR_ID_ECS,
VENDOR_ID_EMERGING_TECH,
+ VENDOR_ID_EMERSON,
VENDOR_ID_FOXCONN,
VENDOR_ID_FUJITSU,
VENDOR_ID_FUNAI,