Changeset 84042 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 28, 2020 11:32:07 AM (5 years ago)

Author:

vboxsync

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

137615

Message:

VUSB: Simplified control message extra data layout (WIP).

Location:

trunk/src/VBox/Devices/USB

Files:

• VUSBInternal.h (modified) (1 diff)
• VUSBUrb.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/USB/VUSBInternal.h

@@ -147 +147 @@
      * accommodate any larger request (unlikely). */
     uint32_t            cbMax;
+    /** VUSB internal data for the extra URB. */
+    VUSBURBVUSBINT      vUsbExtra;
     /** The message URB. */
     VUSBURB             Urb;

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

@@ -611 +611 @@
 /** @todo reuse these? */
     PVUSBCTRLEXTRA pExtra;
-    const size_t cbMax = sizeof(VUSBURBVUSBINT) + sizeof(pExtra->Urb.abData) + sizeof(VUSBSETUP);
+#if 0
+    const size_t cbMax = sizeof(pExtra->Urb.abData) + sizeof(VUSBSETUP);
+#else
+    const size_t cbMax = sizeof(VUSBSETUP);
+#endif
     pExtra = (PVUSBCTRLEXTRA)RTMemAllocZ(RT_UOFFSETOF_DYN(VUSBCTRLEXTRA, Urb.abData[cbMax]));
     if (pExtra)
@@ -629 +633 @@
         RTStrAPrintf(&pExtra->Urb.pszDesc, "URB %p msg->%p", &pExtra->Urb, pUrb);
 #endif
-        pExtra->Urb.pVUsb = (PVUSBURBVUSB)&pExtra->Urb.abData[sizeof(pExtra->Urb.abData) + sizeof(VUSBSETUP)];
+        pExtra->Urb.pVUsb = (PVUSBURBVUSB)&pExtra->vUsbExtra;
         //pExtra->Urb.pVUsb->pCtrlUrb = NULL;
         //pExtra->Urb.pVUsb->pNext = NULL;
@@ -701 +705 @@
      * Check that we've got sufficient space in the message URB.
      */
-    if (pExtra->cbMax < cbBuf + pSetupIn->wLength + sizeof(VUSBURBVUSBINT))
-    {
-#if 1
-        LogRelMax(10, ("VUSB: Control URB too large (wLength=%u)!\n", pSetupIn->wLength));
-        return false;
-#else
-        uint32_t cbReq = RT_ALIGN_32(cbBuf + pSetupIn->wLength + sizeof(VUSBURBVUSBINT), 1024);
+    if (pExtra->cbMax < cbBuf + pSetupIn->wLength)
+    {
+        uint32_t cbReq = RT_ALIGN_32(cbBuf + pSetupIn->wLength, 64);
         PVUSBCTRLEXTRA pNew = (PVUSBCTRLEXTRA)RTMemRealloc(pExtra, RT_UOFFSETOF_DYN(VUSBCTRLEXTRA, Urb.abData[cbReq]));
         if (!pNew)
@@ -717 +717 @@
         if (pExtra != pNew)
         {
+            LogFunc(("Reallocated %u -> %u\n", pExtra->cbMax, cbReq));
             pNew->pMsg = (PVUSBSETUP)pNew->Urb.abData;
             pExtra = pNew;
             pPipe->pCtrl = pExtra;
+            pExtra->Urb.pVUsb = (PVUSBURBVUSB)&pExtra->vUsbExtra;
+            pExtra->Urb.pVUsb->pUrb = &pExtra->Urb;
+            pExtra->Urb.pVUsb->pvFreeCtx = &pExtra->Urb;
         }
 
-        PVUSBURBVUSB pOldVUsb = (PVUSBURBVUSB)&pExtra->Urb.abData[pExtra->cbMax - sizeof(VUSBURBVUSBINT)];
-        pExtra->Urb.pVUsb = (PVUSBURBVUSB)&pExtra->Urb.abData[cbBuf + pSetupIn->wLength];
-        memmove(pExtra->Urb.pVUsb, pOldVUsb, sizeof(VUSBURBVUSBINT));
-        memset(pOldVUsb, 0, (uint8_t *)pExtra->Urb.pVUsb - (uint8_t *)pOldVUsb);
-        pExtra->Urb.pVUsb->pUrb = &pExtra->Urb;
-        pExtra->Urb.pVUsb->pvFreeCtx = &pExtra->Urb;
         pExtra->cbMax = cbReq;
-
-#endif
     }
     Assert(pExtra->Urb.enmState == VUSBURBSTATE_ALLOCATED);