Changeset 87627 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Feb 5, 2021 4:49:57 PM (4 years ago)

Author:

vboxsync

Message:

VUSB: Minor logging improvements.

Location:

trunk/src/VBox/Devices/USB

Files:

• USBProxyDevice.cpp (modified) (2 diffs)
• VUSBUrbTrace.cpp (modified) (2 diffs)

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

@@ -99 +99 @@
         if (RT_FAILURE(rc))
         {
-            Log(("GetStdDescSync: pfnUrbReap failed, rc=%d\n", rc));
+            Log(("GetStdDescSync: pfnUrbQueue failed, rc=%d\n", rc));
             goto err;
         }
@@ -110 +110 @@
         if (!pUrbReaped)
         {
+            Log(("GetStdDescSync: pfnUrbReap returned NULL, cancel and re-reap\n"));
             rc = pProxyDev->pOps->pfnUrbCancel(pProxyDev, &Urb);
             AssertRC(rc);

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

@@ -220 +220 @@
         pSetup = pPipe->pCtrl->pMsg;
         if (pSetup->bRequest == VUSB_REQ_GET_DESCRIPTOR)
-            fDescriptors = true;
+            /* HID report (0x22) and physical (0x23) descriptors do not use standard format
+             * with descriptor length/type at the front. Don't try to dump them, we'll only
+             * misinterpret them.
+             */
+            if (    ((pSetup->bmRequestType >> 5) & 0x3) == 1   /* class */
+                && (RT_HIBYTE(pSetup->wValue) == 0x22) || (RT_HIBYTE(pSetup->wValue) == 0x23))
+            {
+                fDescriptors = false;
+            }
+            else
+                fDescriptors = true;
     }
 
@@ -376 +386 @@
                                      s_cchMaxMsg, pszMsg, pb - pbData, cb - 2, cb / 2 - 1, pb + 2));
                             else
-                                Log(("URB: %*s:       %04x: Length=0!\n", s_cchMaxMsg, pszMsg, pb - pbData));
+                                Log(("URB: %*s:       %04x: Length=0\n", s_cchMaxMsg, pszMsg, pb - pbData));
                         }
                         break;