Changeset 36477 in vbox

Timestamp:

Mar 30, 2011 5:21:29 PM (14 years ago)

Author:

vboxsync

Message:

USB: Also find extra vendor/class descriptor data.

File:

• trunk/src/VBox/Devices/USB/USBProxyDevice.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/USB/USBProxyDevice.cpp

@@ -269 +269 @@
 }
 
+/* Given the pointer to an interface or endpoint descriptor, find any following
+ * non-standard (vendor or class) descriptors.
+ */
+static const void *collect_stray_bits(uint8_t *this_desc, uint8_t *end, uint16_t *cbExtra)
+{
+    uint8_t *tmp, *buf;
+    uint8_t type;
+
+    Assert(*(this_desc + 1) == VUSB_DT_INTERFACE || *(this_desc + 1) == VUSB_DT_ENDPOINT);
+    buf = this_desc;
+
+    /* Skip the current interface/endpoint descriptor. */
+    buf += *(uint8_t *)buf;
+
+    /* Loop until we find another descriptor we understand. */
+    for (tmp = buf; ((tmp + 1) < end) && *tmp; tmp += *tmp)
+    {
+        type = *(tmp + 1);
+        if (type == VUSB_DT_INTERFACE || type == VUSB_DT_ENDPOINT)
+            break;
+    }
+    *cbExtra = tmp - buf;
+    if (*cbExtra)
+        return buf;
+    else
+        return NULL;
+}
+
 /* Setup a vusb_interface structure given some preallocated structures
  * to use, (we counted them already)
@@ -279 +307 @@
     uint32_t altmap[4] = {0,};
     uint8_t *tmp, *end = buf + len;
+    uint8_t *orig_desc = buf;
     uint8_t alt;
     int state;
@@ -328 +357 @@
                 cur_if->pvMore = NULL;
 
+            cur_if->pvClass = collect_stray_bits(tmp, end, &cur_if->cbClass);
+
             pIf->cSettings++;
 
@@ -356 +387 @@
             else
                 cur_ep->pvMore = NULL;
+
+            cur_ep->pvClass = collect_stray_bits(tmp, end, &cur_ep->cbClass);
 
             cur_ep->Core.wMaxPacketSize = RT_LE2H_U16(cur_ep->Core.wMaxPacketSize);
@@ -437 +470 @@
         for(x=0; x < 32; x++)
             if ( cnt.idmap[i] & (1 << x) )
-                if ( !copy_interface(pIf++, (i << 6) | x, &ifd, &epd, (uint8_t *)descs, tot_len) ) {
+                if ( !copy_interface(pIf++, (i << 6) | x, &ifd, &epd, (uint8_t *)out->pvOriginal, tot_len) ) {
                     Log(("copy_interface(%d,,) failed\n", pIf - 1));
                     goto err;