diff options
| author | Xavier Ducrohet <xav@google.com> | 2010-07-20 23:55:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-20 23:55:42 -0700 |
| commit | deafd15f2c3ee7c7356634787c8463e1f5f937d3 (patch) | |
| tree | f820ba96d8f28b2e66cc5573aa78dcb0e431a804 /adb/usb_vendors.c | |
| parent | 3fc108acf2b05153489730178c85b8db94f603af (diff) | |
| parent | 4309d602b562eb9f181b0314837e6096577c6c18 (diff) | |
| download | system_core-deafd15f2c3ee7c7356634787c8463e1f5f937d3.zip system_core-deafd15f2c3ee7c7356634787c8463e1f5f937d3.tar.gz system_core-deafd15f2c3ee7c7356634787c8463e1f5f937d3.tar.bz2 | |
am 4309d602: Merge "Added Toshiba\'s USB VID (0x0930) upon their request." into gingerbread
Merge commit '4309d602b562eb9f181b0314837e6096577c6c18' into gingerbread-plus-aosp
* commit '4309d602b562eb9f181b0314837e6096577c6c18':
Added Toshiba's USB VID (0x0930) upon their request.
Diffstat (limited to 'adb/usb_vendors.c')
| -rw-r--r-- | adb/usb_vendors.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c index 993206f..efeb2a0 100644 --- a/adb/usb_vendors.c +++ b/adb/usb_vendors.c @@ -75,6 +75,8 @@ #define VENDOR_ID_NEC 0x0409 // Panasonic Mobile Communication's USB Vendor ID #define VENDOR_ID_PMC 0x04DA +// Toshiba's USB Vendor ID +#define VENDOR_ID_TOSHIBA 0x0930 /** built-in vendor list */ @@ -99,6 +101,7 @@ int builtInVendorIds[] = { VENDOR_ID_OTGV, VENDOR_ID_NEC, VENDOR_ID_PMC, + VENDOR_ID_TOSHIBA, }; #define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0])) |