Changeset 53097 in vbox for trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp

Timestamp:

Oct 20, 2014 5:37:27 PM (10 years ago)

Author:

vboxsync

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

96616

Message:

USB: Beginnings of emulated USB3 devices.

File:

• trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp

@@ -227 +227 @@
                     ("Invalid name '%.s'\n", sizeof(pReg->szName), pReg->szName),
                     VERR_PDM_INVALID_USB_REGISTRATION);
-    AssertMsgReturn((pReg->fFlags & ~(PDM_USBREG_HIGHSPEED_CAPABLE | PDM_USBREG_EMULATED_DEVICE)) == 0,
+    AssertMsgReturn((pReg->fFlags & ~(PDM_USBREG_HIGHSPEED_CAPABLE | PDM_USBREG_SUPERSPEED_CAPABLE | PDM_USBREG_EMULATED_DEVICE)) == 0,
                     ("fFlags=%#x\n", pReg->fFlags), VERR_PDM_INVALID_USB_REGISTRATION);
     AssertMsgReturn(pReg->cMaxInstances > 0,
@@ -440 +440 @@
 
     for (PPDMUSBHUB pCur = pVM->pdm.s.pUsbHubs; pCur; pCur = pCur->pNext)
-        if (    pCur->cAvailablePorts > 0
-            &&  (   (pCur->fVersions & iUsbVersion)
-                 || pCur->fVersions == VUSB_STDVER_11))
-        {
-            *ppHub = pCur;
+        if (pCur->cAvailablePorts > 0)
+        {
+            /* First check for an exact match. */
             if (pCur->fVersions & iUsbVersion)
+            {
+                *ppHub = pCur;
                 break;
+            }
+            /* For high-speed USB 2.0 devices only, allow USB 1.1 fallback. */
+            if ((iUsbVersion & VUSB_STDVER_20) && (pCur->fVersions == VUSB_STDVER_11))
+                *ppHub = pCur;
         }
     if (*ppHub)
@@ -828 +832 @@
 
         /*
-         * Every device must support USB 1.x hubs; optionally, high-speed USB 2.0 hubs
+         * Every emulated device must support USB 1.x hubs; optionally, high-speed USB 2.0 hubs
          * might be also supported. This determines where to attach the device.
          */
@@ -835 +839 @@
         if (paUsbDevs[i].pUsbDev->pReg->fFlags & PDM_USBREG_HIGHSPEED_CAPABLE)
             iUsbVersion |= VUSB_STDVER_20;
+        if (paUsbDevs[i].pUsbDev->pReg->fFlags & PDM_USBREG_SUPERSPEED_CAPABLE)
+            iUsbVersion |= VUSB_STDVER_30;
 
         /*
@@ -911 +917 @@
     if (pUsbDev->pReg->fFlags & PDM_USBREG_HIGHSPEED_CAPABLE)
         iUsbVersion |= VUSB_STDVER_20;
+    if (pUsbDev->pReg->fFlags & PDM_USBREG_SUPERSPEED_CAPABLE)
+        iUsbVersion |= VUSB_STDVER_30;
 
     /*