commit 38412163da933664791cf511056953b9e3bd1454
author Jean-Baptiste Queru <jbq@google.com> Tue Jan 24 08:49:05 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 24 08:49:05 2012 -0800
tree 94303938ff73cd204266b21d12f4fef81f655605
parent b2d8f896b6ef081c1af263dd13d91d2f435de0fa
parent 70580b20bc8485002df0b3e89e42754c8c9796ff

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

* commit '70580b20bc8485002df0b3e89e42754c8c9796ff':
  adb,fastboot: add USB support for Intel Vendor ID

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index a8b0ca2..e34cd02 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -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,

fastboot/fastboot.c

diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 0639f3b..4190c91 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -152,6 +152,7 @@
 {
     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