ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 149ae11f: Merge "adb,fastboot: add USB support for Intel Vendor ID"

Browse source 
* commit '149ae11fb63818b470156e1652abfad0e08d486d':
  adb,fastboot: add USB support for Intel Vendor ID
This commit is contained in:
Jean-Baptiste Queru 2012-01-24 08:42:49 -08:00 • committed by Android Git Automerger
commit 70580b20bc
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
adb/usb_vendors.c
View file

@ -37,6 +37,8 @@
// Google's USB Vendor ID
#define VENDOR_ID_GOOGLE 0x18d1
// Intel's USB Vendor ID
#define VENDOR_ID_INTEL 0x8087
// HTC's USB Vendor ID
#define VENDOR_ID_HTC 0x0bb4
// Samsung's USB Vendor ID
@ -121,6 +123,7 @@
/** built-in vendor list */
int builtInVendorIds[] = {
VENDOR_ID_GOOGLE,
VENDOR_ID_INTEL,
VENDOR_ID_HTC,
VENDOR_ID_SAMSUNG,
VENDOR_ID_MOTOROLA,

1
fastboot/fastboot.c
View file

@ -150,6 +150,7 @@ int match_fastboot(usb_ifc_info *info)
{
if(!(vendor_id && (info->dev_vendor == vendor_id)) &&
(info->dev_vendor != 0x18d1) && // Google
(info->dev_vendor != 0x8087) && // Intel
(info->dev_vendor != 0x0451) &&
(info->dev_vendor != 0x0502) &&
(info->dev_vendor != 0x0fce) && // Sony Ericsson