diff options
| author | Elliott Hughes <enh@google.com> | 2013-06-17 13:56:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-17 13:56:54 -0700 |
| commit | 8df29c9b61be76c786100d36194b54a871d604f0 (patch) | |
| tree | 2603f06576dfdb3f57ad7ca1ad3556d9bbc4964d /adb | |
| parent | 406c3bb885538e5003efc3736cd2b57ffef2b5cc (diff) | |
| parent | 1aeefcd6900d85911028e6d3e344e338e0a05158 (diff) | |
| download | system_core-8df29c9b61be76c786100d36194b54a871d604f0.zip system_core-8df29c9b61be76c786100d36194b54a871d604f0.tar.gz system_core-8df29c9b61be76c786100d36194b54a871d604f0.tar.bz2 | |
am 1aeefcd6: am 0173ebd5: am 5f8d9c01: Merge "adb: add vendor ID\'s for Nook, Haier, Hisense, and MTK"
* commit '1aeefcd6900d85911028e6d3e344e338e0a05158':
adb: add vendor ID's for Nook, Haier, Hisense, and MTK
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/usb_vendors.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c index 698f8a9..ed53abc 100644 --- a/adb/usb_vendors.c +++ b/adb/usb_vendors.c @@ -143,6 +143,14 @@ #define VENDOR_ID_BYD 0x19D1 // OUYA's USB Vendor ID #define VENDOR_ID_OUYA 0x2836 +// Haier's USB Vendor ID +#define VENDOR_ID_HAIER 0x201E +// Hisense's USB Vendor ID +#define VENDOR_ID_HISENSE 0x109b +// MTK's USB Vendor ID +#define VENDOR_ID_MTK 0x0e8d +// B&N Nook's USB Vendor ID +#define VENDOR_ID_NOOK 0x2080 /** built-in vendor list */ @@ -201,6 +209,10 @@ int builtInVendorIds[] = { VENDOR_ID_XIAOMI, VENDOR_ID_BYD, VENDOR_ID_OUYA, + VENDOR_ID_HAIER, + VENDOR_ID_HISENSE, + VENDOR_ID_MTK, + VENDOR_ID_NOOK, }; #define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0])) |