Changeset 36475 in vbox for trunk/src/VBox

Timestamp:

Mar 30, 2011 4:08:57 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

70865

Message:

USB: Store original config descriptor and refer to it for some non-standard data.

File:

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

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

@@ -320 +320 @@
 
             memcpy(cur_if, ifd, sizeof(cur_if->Core));
-            /** @todo copy any additional descriptor bytes into pvMore */
+
+            /* Point to additional interface descriptor bytes, if any. */
+            AssertCompile(sizeof(cur_if->Core) == VUSB_DT_INTERFACE_MIN_LEN);
+            if (cur_if->Core.bLength - VUSB_DT_INTERFACE_MIN_LEN > 0)
+                cur_if->pvMore = tmp + VUSB_DT_INTERFACE_MIN_LEN;
+            else
+                cur_if->pvMore = NULL;
 
             pIf->cSettings++;
@@ -343 +349 @@
 
             memcpy(cur_ep, epd, sizeof(cur_ep->Core));
-            /** @todo copy any additional descriptor bytes into pvMore */
+
+            /* Point to additional endpoint descriptor bytes, if any. */
+            AssertCompile(sizeof(cur_ep->Core) == VUSB_DT_ENDPOINT_MIN_LEN);
+            if (cur_ep->Core.bLength - VUSB_DT_ENDPOINT_MIN_LEN > 0)
+                cur_ep->pvMore = tmp + VUSB_DT_ENDPOINT_MIN_LEN;
+            else
+                cur_ep->pvMore = NULL;
+
             cur_ep->Core.wMaxPacketSize = RT_LE2H_U16(cur_ep->Core.wMaxPacketSize);
 
@@ -405 +418 @@
     }
 
+    /* Stash a pointer to the raw config descriptor; we may need bits of it later.  */
+    out->pvOriginal = descs;
+
     pIf = (PVUSBINTERFACE)out->paIfs;
     ifd = (PVUSBDESCINTERFACEEX)&pIf[cnt.num_if];
@@ -426 +442 @@
                 }
 
-    free_desc(descs);
     return true;
 err:
@@ -669 +684 @@
     {
         for (unsigned i = 0; i < pThis->DevDesc.bNumConfigurations; i++)
+        {
             RTMemFree((void *)pThis->paCfgDescs[i].paIfs);
+            RTMemFree((void *)pThis->paCfgDescs[i].pvOriginal);
+        }
         /** @todo bugref{2693} cleanup */
         RTMemFree(pThis->paCfgDescs);