From de6f62a609120c3d9e4e53689c3b309842ec874b Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Fri, 24 Jul 2009 14:14:56 -0700
Subject: [PATCH] Add support for Samsung and Motorola devices.

Also update the linux code. Some devices have more complex USB descriptors
which can't be parsed with the simple assumption of just skipping the
endpoint descriptors.
---
 adb/usb_linux.c   | 10 +++++++---
 adb/usb_vendors.c |  6 ++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/adb/usb_linux.c b/adb/usb_linux.c
index 95c2ce60f..537122d1a 100644
--- a/adb/usb_linux.c
+++ b/adb/usb_linux.c
@@ -318,9 +318,13 @@ static int find_usb_device(const char *base,
                     found_device = 1;
                     break;
                 } else {
-                        // skip to next interface
-                    bufptr += (interface->bNumEndpoints * USB_DT_ENDPOINT_SIZE);
-                }
+                    // seek next interface descriptor
+                    if (i < interfaces - 1) {
+                        while (bufptr[1] != USB_DT_INTERFACE) {
+                            bufptr += bufptr[0];
+                        }
+                    }
+                 }
             } // end of for
 
             adb_close(fd);
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 9a1514612..f8c54d7e3 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -39,11 +39,17 @@
 #define VENDOR_ID_GOOGLE        0x18d1
 // HTC's USB Vendor ID
 #define VENDOR_ID_HTC           0x0bb4
+// Samsung's USB Vendor ID
+#define VENDOR_ID_SAMSUNG       0x04e8
+// Motorola's USB Vendor ID
+#define VENDOR_ID_MOTOROLA      0x22b8
 
 /** built-in vendor list */
 int builtInVendorIds[] = {
     VENDOR_ID_GOOGLE,
     VENDOR_ID_HTC,
+    VENDOR_ID_SAMSUNG,
+    VENDOR_ID_MOTOROLA,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))