Changeset 90027 in vbox for trunk/src

Timestamp:

Jul 5, 2021 1:58:33 PM (4 years ago)

Author:

vboxsync

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

145520

Message:

VUSB: Don't needlessly wait just because we need to read a descriptor twice, once to get its size and again to read the whole lot.

File:

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

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

@@ -59 +59 @@
     uint16_t cbInitialHint = cbHint;
 
-    LogFlow(("GetStdDescSync: pProxyDev=%s\n", pProxyDev->pUsbIns->pszName));
+    LogFlow(("GetStdDescSync: pProxyDev=%s, iDescType=%d, iIdx=%d, LangId=%04X, cbHint=%u\n", pProxyDev->pUsbIns->pszName, iDescType, iIdx, LangId, cbHint));
     for (;;)
     {
@@ -68 +68 @@
         VUSBURB Urb;
         AssertCompile(RT_SIZEOFMEMB(VUSBURB, abData) >= _4K);
+        RT_ZERO(Urb);
         Urb.u32Magic      = VUSBURB_MAGIC;
         Urb.enmState      = VUSBURBSTATE_IN_FLIGHT;
         Urb.pszDesc       = (char*)"URB sync";
-        Urb.pHci          = NULL;
-        Urb.paTds         = NULL;
-        Urb.Dev.pvPrivate = NULL;
-        Urb.Dev.pNext     = NULL;
         Urb.DstAddress    = 0;
         Urb.EndPt         = 0;
@@ -81 +78 @@
         Urb.fShortNotOk   = false;
         Urb.enmStatus     = VUSBSTATUS_INVALID;
-        Urb.pVUsb         = NULL;
         cbHint = RT_MIN(cbHint, sizeof(Urb.abData) - sizeof(VUSBSETUP));
         Urb.cbData = cbHint + sizeof(VUSBSETUP);
@@ -159 +155 @@
 
             if (cbHint > sizeof(Urb.abData))
-                Log(("GetStdDescSync: cbHint=%u, Urb.abData=%u\n", cbHint, sizeof(Urb.abData)));
+            {
+                Log(("GetStdDescSync: cbHint=%u, Urb.abData=%u, retrying immediately\n", cbHint, sizeof(Urb.abData)));
+                /* Not an error, go again without incrementing retry count or delaying. */
+                continue;
+            }
 
             goto err;