summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-08-16 15:37:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-16 15:37:43 -0700
commit88ea2f669f914596f934ed50f67f7360aae71b68 (patch)
treef3a4d68599c4af61828c0ba620252f923129d440 /adb
parent699249f9e4f8f5db6e798420fb1b5c6d2e16d42d (diff)
parent3042c265bf3123426e99fed856c9d3b7fa3b3ad6 (diff)
downloadsystem_core-88ea2f669f914596f934ed50f67f7360aae71b68.zip
system_core-88ea2f669f914596f934ed50f67f7360aae71b68.tar.gz
system_core-88ea2f669f914596f934ed50f67f7360aae71b68.tar.bz2
am 3042c265: am b3644d8f: Merge "Add USB Vendor ID for WACOM"
* commit '3042c265bf3123426e99fed856c9d3b7fa3b3ad6': Add USB Vendor ID for WACOM
Diffstat (limited to 'adb')
-rw-r--r--adb/usb_vendors.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 93dda5d..4c0eec5 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -157,7 +157,8 @@
#define VENDOR_ID_ECS 0x03fc
// MSI's USB Vendor ID
#define VENDOR_ID_MSI 0x1462
-
+// Wacom's USB Vendor ID
+#define VENDOR_ID_WACOM 0x0531
/** built-in vendor list */
int builtInVendorIds[] = {
@@ -222,6 +223,7 @@ int builtInVendorIds[] = {
VENDOR_ID_QISDA,
VENDOR_ID_ECS,
VENDOR_ID_MSI,
+ VENDOR_ID_WACOM,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))