Changeset 93934 in vbox for trunk/src/VBox/Devices/USB/DrvVUSBRootHub.cpp

Timestamp:

Feb 24, 2022 4:14:06 PM (3 years ago)

Author:

vboxsync

Message:

Devices/USB/DrvVUSBRootHub: Get rid of device list which is superseeded by the array of devices, bugref:10196

File:

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

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

@@ -918 +918 @@
 static DECLCALLBACK(void) vusbRhCancelAllUrbs(PVUSBIROOTHUBCONNECTOR pInterface)
 {
-    PVUSBROOTHUB pRh = VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface);
-
-    RTCritSectEnter(&pRh->CritSectDevices);
-    PVUSBDEV pDev = pRh->pDevices;
-    while (pDev)
-    {
-        vusbDevIoThreadExecSync(pDev, (PFNRT)vusbRhCancelAllUrbsWorker, 1, pDev);
-        pDev = pDev->pNext;
-    }
-    RTCritSectLeave(&pRh->CritSectDevices);
+    PVUSBROOTHUB pThis = VUSBIROOTHUBCONNECTOR_2_VUSBROOTHUB(pInterface);
+
+    RTCritSectEnter(&pThis->CritSectDevices);
+    for (unsigned i = 0; i < RT_ELEMENTS(pThis->apDevByPort); i++)
+    {
+        PVUSBDEV pDev = pThis->apDevByPort[i];
+        if (pDev)
+            vusbDevIoThreadExecSync(pDev, (PFNRT)vusbRhCancelAllUrbsWorker, 1, pDev);
+    }
+    RTCritSectLeave(&pThis->CritSectDevices);
 }
 
@@ -1419 +1419 @@
     {
         RTCritSectEnter(&pRh->CritSectDevices);
-        pDev->pNext = pRh->pDevices;
-        pRh->pDevices = pDev;
-
         Assert(!pRh->apDevByPort[iPort]);
         pRh->apDevByPort[iPort] = pDev;
@@ -1456 +1453 @@
      */
     RTCritSectEnter(&pRh->CritSectDevices);
-    if (pRh->pDevices != pDev)
-    {
-        PVUSBDEV pPrev = pRh->pDevices;
-        while (pPrev && pPrev->pNext != pDev)
-            pPrev = pPrev->pNext;
-        Assert(pPrev);
-        pPrev->pNext = pDev->pNext;
-    }
-    else
-        pRh->pDevices = pDev->pNext;
-    pDev->pNext = NULL;
-
+    Assert(pRh->apDevByPort[pDev->i16Port] == pDev);
     pRh->apDevByPort[pDev->i16Port] = NULL;
     RTCritSectLeave(&pRh->CritSectDevices);