summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2010-10-18 09:32:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-18 09:32:38 -0700
commit12ddbea0fd87ff21da94d25f0ebe89cbfd004a3b (patch)
tree8ce9ba1a1fd63e1ca2dbccb3665df08df2c9ac03
parent457ce8f67224529a6f3524e8bbca2ecba3a80cc3 (diff)
parenta8b8c0e21ac4bdb7838c8c1b8e7d60f632eda79b (diff)
downloadsystem_core-12ddbea0fd87ff21da94d25f0ebe89cbfd004a3b.zip
system_core-12ddbea0fd87ff21da94d25f0ebe89cbfd004a3b.tar.gz
system_core-12ddbea0fd87ff21da94d25f0ebe89cbfd004a3b.tar.bz2
am a8b8c0e2: am d02e521d: adb: Add support for Philips\'s USB vendor ID
Merge commit 'a8b8c0e21ac4bdb7838c8c1b8e7d60f632eda79b' * commit 'a8b8c0e21ac4bdb7838c8c1b8e7d60f632eda79b': adb: Add support for Philips's USB vendor ID
-rw-r--r--adb/usb_vendors.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index deb2ec8..accca5b 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -83,6 +83,8 @@
#define VENDOR_ID_KT_TECH 0x2116
// Asus's USB Vendor ID
#define VENDOR_ID_ASUS 0x0b05
+// Philips's USB Vendor ID
+#define VENDOR_ID_PHILIPS 0x0471
/** built-in vendor list */
@@ -111,6 +113,7 @@ int builtInVendorIds[] = {
VENDOR_ID_SK_TELESYS,
VENDOR_ID_KT_TECH,
VENDOR_ID_ASUS,
+ VENDOR_ID_PHILIPS,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))