Changeset 93979 in vbox

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

Location:

trunk/src/VBox/Devices/USB

Files:

• DrvVUSBRootHub.cpp (modified) (21 diffs)
• VUSBDevice.cpp (modified) (4 diffs)
• VUSBInternal.h (modified) (9 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);
 

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

@@ -309 +309 @@
     if (pDev->pUsbIns->pReg->pfnUsbSetConfiguration)
     {
-        RTCritSectEnter(&pDev->pHub->pRootHub->CritSectDevices);
+        RTCritSectEnter(&pDev->pHub->CritSectDevices);
         int rc = vusbDevIoThreadExecSync(pDev, (PFNRT)pDev->pUsbIns->pReg->pfnUsbSetConfiguration, 5,
                                          pDev->pUsbIns, pNewCfgDesc->Core.bConfigurationValue,
                                          pDev->pCurCfgDesc, pDev->paIfStates, pNewCfgDesc);
-        RTCritSectLeave(&pDev->pHub->pRootHub->CritSectDevices);
+        RTCritSectLeave(&pDev->pHub->CritSectDevices);
         if (RT_FAILURE(rc))
         {
@@ -459 +459 @@
     if (pDev->pUsbIns->pReg->pfnUsbSetInterface)
     {
-        RTCritSectEnter(&pDev->pHub->pRootHub->CritSectDevices);
+        RTCritSectEnter(&pDev->pHub->CritSectDevices);
         int rc = vusbDevIoThreadExecSync(pDev, (PFNRT)pDev->pUsbIns->pReg->pfnUsbSetInterface, 3, pDev->pUsbIns, iIf, iAlt);
-        RTCritSectLeave(&pDev->pHub->pRootHub->CritSectDevices);
+        RTCritSectLeave(&pDev->pHub->CritSectDevices);
         if (RT_FAILURE(rc))
         {
@@ -533 +533 @@
                 &&  pDev->pUsbIns->pReg->pfnUsbClearHaltedEndpoint)
             {
-                RTCritSectEnter(&pDev->pHub->pRootHub->CritSectDevices);
+                RTCritSectEnter(&pDev->pHub->CritSectDevices);
                 int rc = vusbDevIoThreadExecSync(pDev, (PFNRT)pDev->pUsbIns->pReg->pfnUsbClearHaltedEndpoint,
                                                  2, pDev->pUsbIns, pSetup->wIndex);
-                RTCritSectLeave(&pDev->pHub->pRootHub->CritSectDevices);
+                RTCritSectLeave(&pDev->pHub->CritSectDevices);
                 return RT_SUCCESS(rc);
             }
@@ -1246 +1246 @@
  * @returns VBox status code.
  * @param   pDev        The device to attach.
- * @param   pHub        THe hub to attach to.
- */
-int vusbDevAttach(PVUSBDEV pDev, PVUSBHUB pHub)
+ * @param   pHub        The roothub to attach to.
+ */
+int vusbDevAttach(PVUSBDEV pDev, PVUSBROOTHUB pHub)
 {
     AssertMsg(pDev->enmState == VUSB_DEVICE_STATE_DETACHED, ("enmState=%d\n", pDev->enmState));

trunk/src/VBox/Devices/USB/VUSBInternal.h

@@ -4 +4 @@
  *
  * This subsystem implements USB devices in a host controller independent
- * way.  All the host controller code has to do is use VUSBHUB for its
+ * way.  All the host controller code has to do is use VUSBROOTHUB for its
  * root hub implementation and any emulated USB device may be plugged into
  * the virtual bus.
@@ -57 +57 @@
 /** Pointer to a Virtual USB device (core). */
 typedef struct VUSBDEV *PVUSBDEV;
-/** Pointer to a VUSB hub device. */
-typedef struct VUSBHUB *PVUSBHUB;
 /** Pointer to a VUSB root hub. */
 typedef struct VUSBROOTHUB *PVUSBROOTHUB;
@@ -222 +220 @@
 {
     /** The device interface exposed to the HCI. */
-    VUSBIDEVICE         IDevice;
+    VUSBIDEVICE                 IDevice;
     /** Pointer to the PDM USB device instance. */
-    PPDMUSBINS          pUsbIns;
-    /** Pointer to the hub this device is attached to. */
-    PVUSBHUB            pHub;
+    PPDMUSBINS                  pUsbIns;
+    /** Pointer to the roothub this device is attached to. */
+    PVUSBROOTHUB                pHub;
     /** The device state. */
-    VUSBDEVICESTATE volatile enmState;
+    VUSBDEVICESTATE volatile    enmState;
     /** Reference counter to protect the device structure from going away. */
-    uint32_t volatile        cRefs;
+    uint32_t volatile           cRefs;
 
     /** The device address. */
@@ -296 +294 @@
 DECLINLINE(bool) vusbDevIsRh(PVUSBDEV pDev)
 {
-    return (pDev->pHub == (PVUSBHUB)pDev);
+    return (pDev->pHub == (PVUSBROOTHUB)pDev);
 }
 
@@ -302 +300 @@
 void vusbDevMapEndpoint(PVUSBDEV dev, PCVUSBDESCENDPOINTEX ep);
 int vusbDevDetach(PVUSBDEV pDev);
-int vusbDevAttach(PVUSBDEV pDev, PVUSBHUB pHub);
+int vusbDevAttach(PVUSBDEV pDev, PVUSBROOTHUB pHub);
 DECLINLINE(PVUSBROOTHUB) vusbDevGetRh(PVUSBDEV pDev);
 size_t vusbDevMaxInterfaces(PVUSBDEV dev);
@@ -317 +315 @@
  */
 
-
-/** A VUSB Hub Device - Hub and roothub drivers need to use this struct
- * @todo eliminate this (PDM  / roothubs only).
- */
-typedef struct VUSBHUB
-{
-    VUSBDEV             Dev;
-    PVUSBROOTHUB        pRootHub;
-    uint16_t            cPorts;
-    uint16_t            cDevices;
-    /** Name of the hub. Used for logging. */
-    char               *pszName;
-} VUSBHUB;
-AssertCompileSizeAlignment(VUSBHUB, 8);
 
 /** @} */
@@ -371 +355 @@
 typedef struct VUSBROOTHUB
 {
-    /** The HUB.
-     * @todo remove this? */
-    VUSBHUB                     Hub;
+    /** VUSB device data for the roothub @todo Remove. */
+    VUSBDEV                     Dev;
     /** Pointer to the driver instance. */
     PPDMDRVINS                  pDrvIns;
@@ -389 +372 @@
     /** Structure after a saved state load to re-attach devices. */
     PVUSBROOTHUBLOAD            pLoad;
+
+    /** Number of ports this roothub offers. */
+    uint16_t                    cPorts;
+    /** Number of devices attached to this roothub currently. */
+    uint16_t                    cDevices;
+    /** Name of the roothub. Used for logging. */
+    char                        *pszName;
 
 #if HC_ARCH_BITS == 32
@@ -631 +621 @@
     if (!pDev->pHub)
         return NULL;
-    return pDev->pHub->pRootHub;
+    return pDev->pHub;
 }