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

Timestamp:

Feb 25, 2022 4:21:22 PM (3 years ago)

Author:

vboxsync

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

150186

Message:

Devices/USB: Eliminiate some callback ping-pong and streamline the device attach/detach logic, bugref:10196 [fix, the saved state logic needs to use the new logic as well]

File:

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

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

@@ -400 +400 @@
 
 
+/**
+ * Detaches the given device from the given roothub.
+ *
+ * @returns VBox status code.
+ * @param   pThis       The roothub to detach the device from.
+ * @param   pDev        The device to detach.
+ */
+static int vusbHubDetach(PVUSBROOTHUB pThis, PVUSBDEV pDev)
+{
+    PVUSBHUB pHub = &pThis->Hub;
+
+    Assert(pDev->i16Port != -1);
+
+    /* Cancel all in-flight URBs from this device. */
+    vusbDevCancelAllUrbs(pDev, true);
+
+    /*
+     * Detach the device and mark the port as available.
+     */
+    unsigned uPort = pDev->i16Port;
+    pDev->i16Port = -1;
+    pThis->pIRhPort->pfnDetach(pThis->pIRhPort, uPort);
+    ASMBitSet(&pThis->Bitmap, uPort);
+    pHub->cDevices--;
+
+    /* Check that it's attached and remove it. */
+    RTCritSectEnter(&pThis->CritSectDevices);
+    Assert(pThis->apDevByPort[uPort] == pDev);
+    pThis->apDevByPort[uPort]  = NULL;
+
+    if (pDev->u8Address == VUSB_DEFAULT_ADDRESS)
+    {
+        AssertPtr(pThis->apDevByAddr[VUSB_DEFAULT_ADDRESS]);
+
+        if (pDev == pThis->apDevByAddr[VUSB_DEFAULT_ADDRESS])
+            pThis->apDevByAddr[VUSB_DEFAULT_ADDRESS] = pDev->pNextDefAddr;
+        else
+        {
+            /* Search the list for the device and remove it. */
+            PVUSBDEV pDevPrev = pThis->apDevByAddr[VUSB_DEFAULT_ADDRESS];
+
+            while (   pDevPrev
+                   && pDevPrev->pNextDefAddr != pDev)
+                pDevPrev = pDevPrev->pNextDefAddr;
+
+            AssertPtr(pDevPrev);
+            pDevPrev->pNextDefAddr = pDev->pNextDefAddr;
+        }
+
+        pDev->pNextDefAddr = NULL;
+    }
+    else
+    {
+        Assert(pThis->apDevByAddr[pDev->u8Address] == pDev);
+        pThis->apDevByAddr[pDev->u8Address] = NULL;
+    }
+    RTCritSectLeave(&pThis->CritSectDevices);
+
+    /* Free resources. */
+    vusbDevDetach(pDev);
+    return VINF_SUCCESS;
+}
+
+
+
 /* -=-=-=-=-=- PDMUSBHUBREG methods -=-=-=-=-=- */
 
@@ -440 +505 @@
     Assert(pDev);
 
+    LogRel(("VUSB: Detached '%s' from port %u on %s\n", pDev->pUsbIns->pszName, pDev->i16Port, pHub->pszName));
+
     /*
      * Deal with pending async reset.
@@ -445 +512 @@
      */
     vusbDevSetStateCmp(pDev, VUSB_DEVICE_STATE_DEFAULT, VUSB_DEVICE_STATE_RESET);
-    Assert(pDev->i16Port != -1);
-
-    /* Cancel all in-flight URBs from this device. */
-    vusbDevCancelAllUrbs(pDev, true);
-
-    /*
-     * Detach the device and mark the port as available.
-     */
-    unsigned uPort = pDev->i16Port;
-    pDev->i16Port = -1;
-    pThis->pIRhPort->pfnDetach(pThis->pIRhPort, uPort);
-    ASMBitSet(&pThis->Bitmap, uPort);
-    pHub->cDevices--;
-
-    /* Check that it's attached and remove it. */
-    RTCritSectEnter(&pThis->CritSectDevices);
-    Assert(pThis->apDevByPort[uPort] == pDev);
-    pThis->apDevByPort[uPort]  = NULL;
-
-    if (pDev->u8Address == VUSB_DEFAULT_ADDRESS)
-    {
-        AssertPtr(pThis->apDevByAddr[VUSB_DEFAULT_ADDRESS]);
-
-        if (pDev == pThis->apDevByAddr[VUSB_DEFAULT_ADDRESS])
-            pThis->apDevByAddr[VUSB_DEFAULT_ADDRESS] = pDev->pNextDefAddr;
-        else
-        {
-            /* Search the list for the device and remove it. */
-            PVUSBDEV pDevPrev = pThis->apDevByAddr[VUSB_DEFAULT_ADDRESS];
-
-            while (   pDevPrev
-                   && pDevPrev->pNextDefAddr != pDev)
-                pDevPrev = pDevPrev->pNextDefAddr;
-
-            AssertPtr(pDevPrev);
-            pDevPrev->pNextDefAddr = pDev->pNextDefAddr;
-        }
-
-        pDev->pNextDefAddr = NULL;
-    }
-    else
-    {
-        Assert(pThis->apDevByAddr[pDev->u8Address] == pDev);
-        pThis->apDevByAddr[pDev->u8Address] = NULL;
-    }
-    RTCritSectLeave(&pThis->CritSectDevices);
-
-    /*
-     * Detach and free resources.
-     */
-    vusbDevDetach(pDev);
-
-    LogRel(("VUSB: Detached '%s' from port %u on %s\n", pDev->pUsbIns->pszName, uPort, pHub->pszName));
+    vusbHubDetach(pThis, pDev);
     vusbDevRelease(pDev);
     return VINF_SUCCESS;
@@ -1317 +1332 @@
             if (!VUSBIDevIsSavedStateSupported(&pDev->IDevice))
             {
-                int rc = vusbDevDetach(pDev);
+                int rc = vusbHubDetach(pThis, pDev);
                 AssertRC(rc);
 
@@ -1413 +1428 @@
             {
                 Load.apDevs[Load.cDevs++] = pDev;
-                vusbDevDetach(pDev);
+                vusbHubDetach(pThis, pDev);
                 Assert(!pThis->apDevByPort[i]);
             }