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

Timestamp:

Feb 28, 2022 1:16:30 PM (3 years ago)

Author:

vboxsync

Message:

Devices/USB: Get rid of the VUSBHUB structure which was mostly meaningless as roothubs were supported only since forever, bugref:10196

File:

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

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

@@ -343 +343 @@
 static int vusbHubAttach(PVUSBROOTHUB pThis, PVUSBDEV pDev)
 {
-    LogFlow(("vusbHubAttach: pThis=%p[%s] pDev=%p[%s]\n", pThis, pThis->Hub.pszName, pDev, pDev->pUsbIns->pszName));
-
-    PVUSBHUB pHub = &pThis->Hub;
+    LogFlow(("vusbHubAttach: pThis=%p[%s] pDev=%p[%s]\n", pThis, pThis->pszName, pDev, pDev->pUsbIns->pszName));
 
     /*
@@ -357 +355 @@
     }
     ASMBitClear(&pThis->Bitmap, iPort);
-    pHub->cDevices++;
+    pThis->cDevices++;
     pDev->i16Port = iPort;
 
     /* Call the device attach helper, so it can initialize its state. */
-    int rc = vusbDevAttach(pDev, pHub);
+    int rc = vusbDevAttach(pDev, pThis);
     if (RT_SUCCESS(rc))
     {
@@ -378 +376 @@
         {
             LogRel(("VUSB: Attached '%s' to port %d on %s (%sSpeed)\n", pDev->pUsbIns->pszName,
-                    iPort, pHub->pszName, vusbGetSpeedString(pDev->pUsbIns->enmSpeed)));
+                    iPort, pThis->pszName, vusbGetSpeedString(pDev->pUsbIns->enmSpeed)));
             return VINF_SUCCESS;
         }
@@ -392 +390 @@
 
     ASMBitSet(&pThis->Bitmap, iPort);
-    pHub->cDevices--;
+    pThis->cDevices--;
     pDev->i16Port = -1;
     LogRel(("VUSB: Failed to attach '%s' to port %d, rc=%Rrc\n", pDev->pUsbIns->pszName, iPort, rc));
@@ -409 +407 @@
 static int vusbHubDetach(PVUSBROOTHUB pThis, PVUSBDEV pDev)
 {
-    PVUSBHUB pHub = &pThis->Hub;
-
     Assert(pDev->i16Port != -1);
 
@@ -423 +419 @@
     pThis->pIRhPort->pfnDetach(pThis->pIRhPort, uPort);
     ASMBitSet(&pThis->Bitmap, uPort);
-    pHub->cDevices--;
+    pThis->cDevices--;
 
     /* Check that it's attached and remove it. */
@@ -480 +476 @@
     RT_NOREF(iPort);
     PVUSBROOTHUB pThis = PDMINS_2_DATA(pDrvIns, PVUSBROOTHUB);
-    PVUSBHUB pHub = &pThis->Hub;
     PVUSBDEV pDev = (PVUSBDEV)pUsbIns->pvVUsbDev2;
     Assert(pDev);
 
-    LogRel(("VUSB: Detached '%s' from port %u on %s\n", pDev->pUsbIns->pszName, pDev->i16Port, pHub->pszName));
+    LogRel(("VUSB: Detached '%s' from port %u on %s\n", pDev->pUsbIns->pszName, pDev->i16Port, pThis->pszName));
 
     /*
@@ -544 +539 @@
     }
     else
-        vusbUrbPoolFree(&pRh->Hub.Dev.UrbPool, pUrb);
+        vusbUrbPoolFree(&pRh->Dev.UrbPool, pUrb);
 }
 
@@ -555 +550 @@
 {
     RT_NOREF(pszTag);
-    PVUSBURBPOOL pUrbPool = &pRh->Hub.Dev.UrbPool;
+    PVUSBURBPOOL pUrbPool = &pRh->Dev.UrbPool;
 
     if (RT_UNLIKELY(cbData > (32 * _1M)))
@@ -822 +817 @@
     LogFlow(("vusR3bRhPowerOn: pRh=%p\n", pRh));
 
-    Assert(     pRh->Hub.Dev.enmState != VUSB_DEVICE_STATE_DETACHED
-           &&   pRh->Hub.Dev.enmState != VUSB_DEVICE_STATE_RESET);
-
-    if (pRh->Hub.Dev.enmState == VUSB_DEVICE_STATE_ATTACHED)
-        pRh->Hub.Dev.enmState = VUSB_DEVICE_STATE_POWERED;
+    Assert(     pRh->Dev.enmState != VUSB_DEVICE_STATE_DETACHED
+           &&   pRh->Dev.enmState != VUSB_DEVICE_STATE_RESET);
+
+    if (pRh->Dev.enmState == VUSB_DEVICE_STATE_ATTACHED)
+        pRh->Dev.enmState = VUSB_DEVICE_STATE_POWERED;
 
     return VINF_SUCCESS;
@@ -838 +833 @@
     LogFlow(("vusbR3RhDevPowerOff: pThis=%p\n", pThis));
 
-    Assert(     pThis->Hub.Dev.enmState != VUSB_DEVICE_STATE_DETACHED
-           &&   pThis->Hub.Dev.enmState != VUSB_DEVICE_STATE_RESET);
+    Assert(     pThis->Dev.enmState != VUSB_DEVICE_STATE_DETACHED
+           &&   pThis->Dev.enmState != VUSB_DEVICE_STATE_RESET);
 
     /*
@@ -848 +843 @@
         VUSBIRhReapAsyncUrbs(&pThis->IRhConnector, uPort, 0);
 
-    pThis->Hub.Dev.enmState = VUSB_DEVICE_STATE_ATTACHED;
+    pThis->Dev.enmState = VUSB_DEVICE_STATE_ATTACHED;
     return VINF_SUCCESS;
 }
@@ -949 +944 @@
     else
     {
-        vusbDevRetain(&pRh->Hub.Dev);
-        pUrb->pVUsb->pDev = &pRh->Hub.Dev;
+        vusbDevRetain(&pRh->Dev);
+        pUrb->pVUsb->pDev = &pRh->Dev;
         Log(("vusb: pRh=%p: SUBMIT: Address %i not found!!!\n", pRh, pUrb->DstAddress));
 
@@ -1101 +1096 @@
     PVUSBDEV pDev = vusbR3RhGetVUsbDevByPortRetain(pRh, uPort);
 
-    if (&pRh->Hub != pDev->pHub)
+    if (pDev->pHub != pRh)
         AssertFailedReturn(VERR_INVALID_PARAMETER);
 
@@ -1494 +1489 @@
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pDrvIns->IBase);
     PDMIBASE_RETURN_INTERFACE(pszIID, VUSBIROOTHUBCONNECTOR, &pRh->IRhConnector);
-    PDMIBASE_RETURN_INTERFACE(pszIID, VUSBIDEVICE, &pRh->Hub.Dev.IDevice);
     return NULL;
 }
@@ -1515 +1509 @@
     PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
 
-    vusbUrbPoolDestroy(&pRh->Hub.Dev.UrbPool);
-    if (pRh->Hub.pszName)
-    {
-        RTStrFree(pRh->Hub.pszName);
-        pRh->Hub.pszName = NULL;
+    vusbUrbPoolDestroy(&pRh->Dev.UrbPool);
+    if (pRh->pszName)
+    {
+        RTStrFree(pRh->pszName);
+        pRh->pszName = NULL;
     }
     if (pRh->hSniffer != VUSBSNIFFER_NIL)
@@ -1579 +1573 @@
     pDrvIns->IBase.pfnQueryInterface    = vusbRhQueryInterface;
     /* the usb device */
-    pThis->Hub.Dev.enmState             = VUSB_DEVICE_STATE_ATTACHED;
-    pThis->Hub.Dev.cRefs                = 1;
-    /* the hub */
-    pThis->Hub.pRootHub                 = pThis;
+    pThis->Dev.enmState                 = VUSB_DEVICE_STATE_ATTACHED;
+    pThis->Dev.cRefs                    = 1;
     //pThis->hub.cPorts                - later
-    pThis->Hub.cDevices                 = 0;
-    pThis->Hub.Dev.pHub                 = &pThis->Hub;
-    RTStrAPrintf(&pThis->Hub.pszName, "RootHub#%d", pDrvIns->iInstance);
+    pThis->cDevices                     = 0;
+    pThis->Dev.pHub                     = pThis;
+    RTStrAPrintf(&pThis->pszName, "RootHub#%d", pDrvIns->iInstance);
     /* misc */
     pThis->pDrvIns                      = pDrvIns;
@@ -1627 +1619 @@
      * ASSUME that the number of ports reported now at creation time is the max number.
      */
-    pThis->Hub.cPorts = pThis->pIRhPort->pfnGetAvailablePorts(pThis->pIRhPort, &pThis->Bitmap);
-    Log(("vusbRhConstruct: cPorts=%d\n", pThis->Hub.cPorts));
+    pThis->cPorts = pThis->pIRhPort->pfnGetAvailablePorts(pThis->pIRhPort, &pThis->Bitmap);
+    Log(("vusbRhConstruct: cPorts=%d\n", pThis->cPorts));
 
     /*
@@ -1637 +1629 @@
     Log(("vusbRhConstruct: fHcVersions=%u\n", pThis->fHcVersions));
 
-    rc = vusbUrbPoolInit(&pThis->Hub.Dev.UrbPool);
+    rc = vusbUrbPoolInit(&pThis->Dev.UrbPool);
     if (RT_FAILURE(rc))
         return rc;
@@ -1657 +1649 @@
      */
     PCPDMUSBHUBHLP pHlpUsb; /* not used currently */
-    rc = PDMDrvHlpUSBRegisterHub(pDrvIns, pThis->fHcVersions, pThis->Hub.cPorts, &g_vusbHubReg, &pHlpUsb);
+    rc = PDMDrvHlpUSBRegisterHub(pDrvIns, pThis->fHcVersions, pThis->cPorts, &g_vusbHubReg, &pHlpUsb);
     if (RT_FAILURE(rc))
         return rc;
@@ -1800 +1792 @@
                            "/VUSB/%d/FramesProcessedClbk",     pDrvIns->iInstance);
 #endif
-    PDMDrvHlpSTAMRegisterF(pDrvIns, (void *)&pThis->Hub.Dev.UrbPool.cUrbsInPool, STAMTYPE_U32, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT, "The number of URBs in the pool.",
+    PDMDrvHlpSTAMRegisterF(pDrvIns, (void *)&pThis->Dev.UrbPool.cUrbsInPool, STAMTYPE_U32, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT, "The number of URBs in the pool.",
                            "/VUSB/%d/cUrbsInPool",             pDrvIns->iInstance);