Changeset 5525 in vbox

Timestamp:

Oct 26, 2007 6:03:37 PM (17 years ago)

Author:

vboxsync

Message:

PDMUsb changes.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• include/VBox/mm.h (modified) (7 diffs)
• include/VBox/pdmdev.h (modified) (5 diffs)
• include/VBox/pdmdrv.h (modified) (3 diffs)
• include/VBox/pdmusb.h (modified) (3 diffs)
• include/VBox/vusb.h (modified) (8 diffs)
• src/VBox/Devices/Makefile.kmk (modified) (3 diffs)
• src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp (modified) (1 diff)
• src/VBox/Runtime/testcase/tstCritSect.cpp (modified) (1 diff)
• src/VBox/VMM/MMHeap.cpp (modified) (1 diff)
• src/VBox/VMM/PDMDevice.cpp (modified) (3 diffs)
• src/VBox/VMM/PDMDriver.cpp (modified) (2 diffs)
• src/VBox/VMM/PDMInternal.h (modified) (7 diffs)

trunk/Config.kmk

@@ -199 +199 @@
 # Enable the USB feature.
 VBOX_WITH_USB = 1
+# Enable the new PDM USB management code (work in progress).
+VBOX_WITH_PDMUSB = 1
 # Enable the ISCSI feature.
 VBOX_WITH_ISCSI = 1

trunk/include/VBox/mm.h

@@ -43 +43 @@
  * Normal MMIO may set it but that depends on whether the RAM range was
  * created specially for the MMIO or not.
- * 
- * @remarks The current implementation will always reserve backing 
+ *
+ * @remarks The current implementation will always reserve backing
  *          memory for reserved  ranges to simplify things.
  */
@@ -51 +51 @@
  * The page have a HC physical address which contains the BIOS code. All write
  * access is trapped and ignored.
- * 
- * HACK: Writable shadow ROM is indicated by both ROM and MMIO2 being 
+ *
+ * HACK: Writable shadow ROM is indicated by both ROM and MMIO2 being
  *       set. (We're out of bits.)
  */
@@ -108 +108 @@
  * @{
  */
-typedef enum 
+typedef enum
 {
     /** Normal physical region (flags specify exact page type) */
@@ -166 +166 @@
     MM_TAG_PDM_DRIVER,
     MM_TAG_PDM_DRIVER_USER,
+    MM_TAG_PDM_USB,
+    MM_TAG_PDM_USB_USER,
     MM_TAG_PDM_LUN,
     MM_TAG_PDM_QUEUE,
@@ -654 +656 @@
 /**
  * Reset notification.
- * 
- * MM will reload shadow ROMs into RAM at this point and make 
+ *
+ * MM will reload shadow ROMs into RAM at this point and make
  * the ROM writable.
- * 
+ *
  * @param   pVM             The VM handle.
  */
@@ -924 +926 @@
  *                              This must be cbRange bytes big.
  *                              It will be copied and doesn't have to stick around.
- *                              It will be copied and doesn't have to stick around if fShadow is clear. 
+ *                              It will be copied and doesn't have to stick around if fShadow is clear.
  * @param   fShadow             Whether to emulate ROM shadowing. This involves leaving
  *                              the ROM writable for a while during the POST and refreshing
@@ -938 +940 @@
 /**
  * Write-protects a shadow ROM range.
- * 
+ *
  * This is called late in the POST for shadow ROM ranges.
- * 
+ *
  * @returns VBox status code.
  * @param   pVM         The VM handle.
- * @param   GCPhys      Start of the registered shadow ROM range 
+ * @param   GCPhys      Start of the registered shadow ROM range
  * @param   cbRange     The length of the registered shadow ROM range.
  *                      This can be NULL (not sure about the BIOS interface yet).

trunk/include/VBox/pdmdev.h

@@ -385 +385 @@
 
 /**
- * PCI Bus registaration structure.
+ * PCI Bus registration structure.
  * All the callbacks, except the PCIBIOS hack, are working on PCI devices.
  */
@@ -1791 +1791 @@
      * @param   pvBinary            Pointer to the binary data backing the ROM image.
      *                              This must be cbRange bytes big.
-     *                              It will be copied and doesn't have to stick around if fShadow is clear. 
+     *                              It will be copied and doesn't have to stick around if fShadow is clear.
      * @param   fShadow             Whether to emulate ROM shadowing. This involves leaving
      *                              the ROM writable for a while during the POST and refreshing
@@ -1797 +1797 @@
      *                              pvBinary has to stick around for the lifespan of the VM.
      * @param   pszDesc             Pointer to description string. This must not be freed.
-     * 
+     *
      * @remark  There is no way to remove the rom, automatically on device cleanup or
      *          manually from the device yet. At present I doubt we need such features...
@@ -2178 +2178 @@
     /**
      * Creates a PDM thread.
-     * 
-     * This differs from the RTThreadCreate() API in that PDM takes care of suspending, 
+     *
+     * This differs from the RTThreadCreate() API in that PDM takes care of suspending,
      * resuming, and destroying the thread as the VM state changes.
-     * 
+     *
      * @returns VBox status code.
      * @param   pDevIns     The device instance.
@@ -2549 +2549 @@
     /**
      * Write protects a shadow ROM mapping.
-     * 
-     * This is intented for use by the system BIOS or by the device that 
+     *
+     * This is intented for use by the system BIOS or by the device that
      * employs a shadow ROM BIOS, so that the shadow ROM mapping can be
      * write protected once the POST is over.
-     * 
+     *
      * @param   pDevIns     Device instance.
      * @param   GCPhysStart Where the shadow ROM mapping starts.

trunk/include/VBox/pdmdrv.h

@@ -255 +255 @@
 
 /**
+ * USB hub registration structure.
+ */
+typedef struct PDMUSBHUBREG
+{
+    /** Structure version number. PDM_USBHUBREG_VERSION defines the current version. */
+    uint32_t            u32Version;
+
+    /**
+     * Request the hub to attach of the specified device.
+     *
+     * @returns VBox status code.
+     * @param   pDrvIns     The hub instance.
+     * @param   pUsbIns     The device to attach.
+     * @param   piPort      Where to store the port number the device was attached to.
+     * @thread EMT.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnAttachDevice,(PPDMDRVINS pDrvIns, PPDMUSBINS pUsbIns, uint32_t *piPort));
+
+    /**
+     * Request the hub to detach of the specified device.
+     *
+     * The device has previously been attached to the hub with the
+     * pfnAttachDevice call. This call is not currently expected to
+     * fail.
+     *
+     * @returns VBox status code.
+     * @param   pDrvIns     The hub instance.
+     * @param   pUsbIns     The device to detach.
+     * @param   iPort       The port number returned by the attach call.
+     * @thread EMT.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnDetachDevice,(PPDMDRVINS pDrvIns, PPDMUSBINS pUsbIns, uint32_t iPort));
+
+    /** Counterpart to u32Version, same value. */
+    uint32_t            u32TheEnd;
+} PDMUSBHUBREG;
+/** Pointer to a const USB hub registration structure. */
+typedef const PDMUSBHUBREG *PCPDMUSBHUBREG;
+
+/** Current PDMUSBHUBREG version number. */
+#define PDM_USBHUBREG_VERSION       0xeb010000
+
+
+/**
+ * USB hub helpers.
+ * This is currently just a place holder.
+ */
+typedef struct PDMUSBHUBHLP
+{
+    /** Structure version. PDM_USBHUBHLP_VERSION defines the current version. */
+    uint32_t                    u32Version;
+
+    /** Just a safety precaution. */
+    uint32_t                    u32TheEnd;
+} PDMUSBHUBHLP;
+/** Pointer to PCI helpers. */
+typedef PDMUSBHUBHLP *PPDMUSBHUBHLP;
+/** Pointer to const PCI helpers. */
+typedef const PDMUSBHUBHLP *PCPDMUSBHUBHLP;
+/** Pointer to const PCI helpers pointer. */
+typedef PCPDMUSBHUBHLP *PPCPDMUSBHUBHLP;
+
+/** Current PDMUSBHUBHLP version number. */
+#define PDM_USBHUBHLP_VERSION       0xea010000
+
+
+
+/**
  * Poller callback.
  *
@@ -546 +614 @@
      * @returns VBox status code.
      * @param   pDrvIns         The driver instance.
-     * @param   pvReserved      Reserved for future inteface callback structure.
-     * @param   ppvReservedHlp  Reserved for future helper callback structure.
+     * @param   fVersions       Indicates the kinds of USB devices that can be attached to this HUB.
+     * @param   cPorts          The number of ports.
+     * @param   pUsbHubReg      The hub callback structure that PDMUsb uses to interact with it.
+     * @param   ppUsbHubHlp     The helper callback structure that the hub uses to talk to PDMUsb.
      *
      * @thread  EMT.
      */
-    DECLR3CALLBACKMEMBER(int, pfnUSBRegisterHub,(PPDMDRVINS pDrvIns, void *pvReservedIn, void **ppvReservedHlp));
+    DECLR3CALLBACKMEMBER(int, pfnUSBRegisterHub,(PPDMDRVINS pDrvIns, uint32_t fVersions, uint32_t cPorts, PCPDMUSBHUBREG pUsbHubReg, PPCPDMUSBHUBHLP ppUsbHubHlp));
 
     /**
@@ -716 +786 @@
  * @copydoc PDMDRVHLP::pfnUSBRegisterHub
  */
-DECLINLINE(int) PDMDrvHlpUSBRegisterHub(PPDMDRVINS pDrvIns, void *pvReservedIn, void **ppvReservedHlp)
-{
-    return pDrvIns->pDrvHlp->pfnUSBRegisterHub(pDrvIns, pvReservedIn, ppvReservedHlp);
+DECLINLINE(int) PDMDrvHlpUSBRegisterHub(PPDMDRVINS pDrvIns, uint32_t fVersions, uint32_t cPorts, PCPDMUSBHUBREG pUsbHubReg, PPCPDMUSBHUBHLP ppUsbHubHlp)
+{
+    return pDrvIns->pDrvHlp->pfnUSBRegisterHub(pDrvIns, fVersions, cPorts, pUsbHubReg, ppUsbHubHlp);
 }
 

trunk/include/VBox/pdmusb.h

@@ -99 +99 @@
      * complicated failure paths.
      *
-     * @returns VBox status.
-     * @param   pUsbIns     The USB device instance data.
-     * @remarks Optional.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnDestruct,(PPDMUSBINS pUsbIns));
+     * @param   pUsbIns     The USB device instance data.
+     * @remarks Optional.
+     */
+    DECLR3CALLBACKMEMBER(void, pfnDestruct,(PPDMUSBINS pUsbIns));
 
     /**
@@ -435 +434 @@
     /** Pointer to device instance data. */
     R3PTRTYPE(void *)           pvInstanceDataR3;
-    /* padding to make achInstanceData aligned at 32 byte boundrary. */
-    uint32_t                    au32Padding[HC_ARCH_BITS == 32 ? 4 : 6];
+    /** Pointer to the VUSB Device structure.
+     * The constructor sets this.
+     * @todo Integrate VUSBDEV into this structure. */
+    R3PTRTYPE(void *)           pvVUsbDev;
+    /** Padding to make achInstanceData aligned at 32 byte boundrary. */
+    uint32_t                    au32Padding[HC_ARCH_BITS == 32 ? 3 : 4];
     /** Device instance data. The size of this area is defined
      * in the PDMUSBREG::cbInstanceData field. */
@@ -561 +564 @@
 typedef DECLCALLBACK(int) FNPDMVBOXUSBREGISTER(PCPDMUSBREGCB pCallbacks, uint32_t u32Version);
 
+
+/**
+ * Creates a USB proxy device instance.
+ *
+ * This will find an appropriate HUB for the USB device, create the necessary CFGM stuff
+ * and try instantiate the proxy device.
+ *
+ * @returns VBox status code.
+ * @param   pVM             The VM handle.
+ * @param   pUuid           The UUID thats to be associated with the device.
+ * @param   fRemote         Whether it's a remove or local device.
+ * @param   pszAddress      The address string.
+ * @param   pvBackend       Pointer to the backend.
+ * @param   iUsbVersion     The preferred USB version.
+ */
+PDMR3DECL(int) PDMR3USBCreateProxyDevice(PVM pVM, PCRTUUID pUuid, bool fRemote, const char *pszAddress, void *pvBackend, uint32_t iUsbVersion);
+
+/**
+ * Detaches and destroys a USB device.
+ *
+ * @returns VBox status code.
+ * @param   pVM             The VM handle.
+ * @param   pUuid           The UUID associated with the device to detach.
+ * @thread  EMT
+ */
+PDMR3DECL(int) PDMR3USBDetachDevice(PVM pVM, PCRTUUID pUuid);
+
+/**
+ * Checks if there are any USB hubs attached.
+ *
+ * @returns true / false accordingly.
+ * @param   pVM     Pointer to the shared VM structure.
+ */
+PDMR3DECL(bool) PDMR3USBHasHub(PVM pVM);
+
+
 /** @} */
 

trunk/include/VBox/vusb.h

@@ -30 +30 @@
 #define VUSB_BUS_HZ                 12000000
 
-/** @name USB Standard version flags. 
+/** @name USB Standard version flags.
  * @{ */
-/** Indicates USB 1.1 support. */ 
-#define VUSB_STDVER_11              BIT(1) 
-/** Indicates USB 2.0 support. */ 
-#define VUSB_STDVER_20              BIT(2) 
-/** @} */
-
-/** @name USB Standard version
- * @{ */
- typedef enum VUSBREVISION
-{
-    /** Indicates USB 1.1 support. */
-    VUSBREVISION_11 = 0x10,
-    /** Indicates USB 2.0 support. */
-    VUSBREVISION_20 = 0x20
-} VUSBREVISION;
+/** Indicates USB 1.1 support. */
+#define VUSB_STDVER_11              BIT(1)
+/** Indicates USB 2.0 support. */
+#define VUSB_STDVER_20              BIT(2)
 /** @} */
 
@@ -58 +47 @@
 
 /** Pointer to an USB request descriptor. */
-typedef struct vusb_urb *PVUSBURB;
+typedef struct VUSBURB          *PVUSBURB;
 
 
@@ -94 +83 @@
 
     /**
-     * Get the supported USB revision
-     *
-     * @returns The supported revision
+     * Gets the supported USB versions.
+     *
+     * @returns The mask of supported USB versions.
      * @param   pInterface      Pointer to this structure.
      */
-    DECLR3CALLBACKMEMBER(VUSBREVISION, pfnGetRevision, (PVUSBIROOTHUBPORT pInterface));
+    DECLR3CALLBACKMEMBER(uint32_t, pfnGetUSBVersions,(PVUSBIROOTHUBPORT pInterface));
 
     /**
@@ -150 +139 @@
      */
     DECLR3CALLBACKMEMBER(bool, pfnXferError,(PVUSBIROOTHUBPORT pInterface, PVUSBURB pUrb));
+
+    /** Alignment dummy. */
+    RTR3PTR Alignment;
 
 } VUSBIROOTHUBPORT;
@@ -188 +180 @@
      * @param   pLed        Pointer to USB Status LED
      */
-    DECLR3CALLBACKMEMBER(int, pfnSubmitUrb,(PVUSBIROOTHUBCONNECTOR pInterface, PVUSBURB pUrb, PPDMLED pLed));
+    DECLR3CALLBACKMEMBER(int, pfnSubmitUrb,(PVUSBIROOTHUBCONNECTOR pInterface, PVUSBURB pUrb, struct PDMLED *pLed));
 
     /**
@@ -245 +237 @@
 
 /** @copydoc VUSBIROOTHUBCONNECTOR::pfnSubmitUrb */
-DECLINLINE(int) VUSBIRhSubmitUrb(PVUSBIROOTHUBCONNECTOR pInterface, PVUSBURB pUrb, PPDMLED pLed)
+DECLINLINE(int) VUSBIRhSubmitUrb(PVUSBIROOTHUBCONNECTOR pInterface, PVUSBURB pUrb, struct PDMLED *pLed)
 {
     return pInterface->pfnSubmitUrb(pInterface, pUrb, pLed);
@@ -620 +612 @@
  * Asynchronous USB request descriptor
  */
-typedef struct vusb_urb
+typedef struct VUSBURB
 {
     /** URB magic value. */
@@ -688 +680 @@
     /** The device - NULL until a submit has been is attempted.
      * This is set when allocating the URB. */
-    struct vusb_dev *pDev;
+    struct VUSBDEV *pDev;
     /** The device address.
      * This is set at allocation time. */

trunk/src/VBox/Devices/Makefile.kmk

@@ -90 +90 @@
 ifdef VBOX_WITH_USB
  VBoxDD_DEFS           += VBOX_WITH_USB IN_USB_R3
+ ifdef VBOX_WITH_PDMUSB
+  VBoxDD_DEFS          += VBOX_WITH_PDMUSB
+ endif
 endif
 ifdef VBOX_WITH_AHCI
@@ -203 +206 @@
 ifdef VBOX_WITH_USB
 DevicesR3_DEFS         += VBOX_WITH_USB IN_USB_R3
+ ifdef VBOX_WITH_PDMUSB
+  DevicesR3_DEFS       += VBOX_WITH_PDMUSB
+ endif
 DevicesR3_SOURCES      += \
         USB/DevOHCI.cpp \
@@ -499 +505 @@
 ifdef VBOX_WITH_USB
  Drivers_DEFS         += VBOX_WITH_USB IN_USB_R3
+ ifdef VBOX_WITH_PDMUSB
+  Drivers_DEFS        += VBOX_WITH_PDMUSB
+ endif
  Drivers_SOURCES      += \
         USB/DrvVUSBRootHub.cpp \

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp

@@ -797 +797 @@
     GEN_CHECK_OFF(EHCI, pDevInsGC);
     GEN_CHECK_OFF(EHCI, pLoad);
+    GEN_CHECK_OFF(EHCI, fAsyncTraversalTimerActive);
 # ifdef VBOX_WITH_STATISTICS
     GEN_CHECK_OFF(EHCI, StatCanceledIsocUrbs);

trunk/src/VBox/Runtime/testcase/tstCritSect.cpp

@@ -24 +24 @@
 #endif
 #include <iprt/critsect.h>
+#include <iprt/lock.h>
 #include <iprt/thread.h>
 #include <iprt/log.h>

trunk/src/VBox/VMM/MMHeap.cpp

@@ -596 +596 @@
         TAG2STR(PDM_DRIVER);
         TAG2STR(PDM_DRIVER_USER);
+        TAG2STR(PDM_USB);
+        TAG2STR(PDM_USB_USER);
         TAG2STR(PDM_LUN);
         TAG2STR(PDM_QUEUE);

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -613 +613 @@
     {
         /* make filename */
-        char *pszFilename = pdmR3FileR3("VBoxDD", /*fShared=*/true);
+        char *pszFilename = pdmR3FileR3("VBoxDD", /* fShared = */ true);
         if (!pszFilename)
             return VERR_NO_TMP_MEMORY;
@@ -622 +622 @@
 
         /* make filename */
-        pszFilename = pdmR3FileR3("VBoxDD2", /*fShared=*/true);
+        pszFilename = pdmR3FileR3("VBoxDD2", /* fShared = */ true);
         if (!pszFilename)
             return VERR_NO_TMP_MEMORY;
@@ -2422 +2422 @@
     int rc = pdmR3ThreadCreateDevice(pDevIns->Internal.s.pVMHC, pDevIns, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName);
 
-    LogFlow(("pdmR3DevHlp_PDMThreadCreate: caller='%s'/%d: returns %Vrc *ppThread=%RTthrd\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, 
+    LogFlow(("pdmR3DevHlp_PDMThreadCreate: caller='%s'/%d: returns %Vrc *ppThread=%RTthrd\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance,
             rc, *ppThread));
     return rc;

trunk/src/VBox/VMM/PDMDriver.cpp

@@ -90 +90 @@
 static DECLCALLBACK(void) pdmR3DrvHlp_STAMRegisterV(PPDMDRVINS pDrvIns, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility, STAMUNIT enmUnit, const char *pszDesc, const char *pszName, va_list args);
 static DECLCALLBACK(int) pdmR3DrvHlp_SUPCallVMMR0Ex(PPDMDRVINS pDrvIns, unsigned uOperation, void *pvArg, unsigned cbArg);
-static DECLCALLBACK(int) pdmR3DrvHlp_USBRegisterHub(PPDMDRVINS pDrvIns, void *pvReservedIn, void **ppvReservedHlp);
+static DECLCALLBACK(int) pdmR3DrvHlp_USBRegisterHub(PPDMDRVINS pDrvIns, uint32_t fVersions, uint32_t cPorts, PCPDMUSBHUBREG pUsbHubReg, PPCPDMUSBHUBHLP ppUsbHubHlp);
 static DECLCALLBACK(int) pdmR3DrvHlp_PDMThreadCreate(PPDMDRVINS pDrvIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADDRV pfnThread,
                                                      PFNPDMTHREADWAKEUPDRV pfnWakeup, size_t cbStack, RTTHREADTYPE enmType, const char *pszName);
@@ -1004 +1004 @@
 
 /** @copydoc PDMDRVHLP::pfnUSBRegisterHub */
-static DECLCALLBACK(int) pdmR3DrvHlp_USBRegisterHub(PPDMDRVINS pDrvIns, void *pvReservedIn, void **ppvReservedHlp)
-{
-    PDMDRV_ASSERT_DRVINS(pDrvIns);
-    VM_ASSERT_EMT(pDrvIns->Internal.s.pVM);
-    LogFlow(("pdmR3DrvHlp_USBRegisterHub: caller='%s'/%d: pvReservedIn=%p ppvReservedHlp=%p\n",
-             pDrvIns->pDrvReg->szDriverName, pDrvIns->iInstance, pvReservedIn, ppvReservedHlp));
-
-/// @todo    int rc = PDMUSBRegisterHub(pDrvIns->Internal.s.pVM, pvReservedIn, ppvReservedHlp);
-    int rc = VINF_SUCCESS;
+static DECLCALLBACK(int) pdmR3DrvHlp_USBRegisterHub(PPDMDRVINS pDrvIns, uint32_t fVersions, uint32_t cPorts, PCPDMUSBHUBREG pUsbHubReg, PPCPDMUSBHUBHLP ppUsbHubHlp)
+{
+    PDMDRV_ASSERT_DRVINS(pDrvIns);
+    VM_ASSERT_EMT(pDrvIns->Internal.s.pVM);
+    LogFlow(("pdmR3DrvHlp_USBRegisterHub: caller='%s'/%d: fVersions=%#x cPorts=%#x pUsbHubReg=%p ppUsbHubHlp=%p\n",
+             pDrvIns->pDrvReg->szDriverName, pDrvIns->iInstance, fVersions, cPorts, pUsbHubReg, ppUsbHubHlp));
+
+    int rc = pdmR3UsbRegisterHub(pDrvIns->Internal.s.pVM, pDrvIns, fVersions, cPorts, pUsbHubReg, ppUsbHubHlp);
 
     LogFlow(("pdmR3DrvHlp_USBRegisterHub: caller='%s'/%d: returns %Vrc\n", pDrvIns->pDrvReg->szDriverName, pDrvIns->iInstance, rc));

trunk/src/VBox/VMM/PDMInternal.h

@@ -24 +24 @@
 #include <VBox/cfgm.h>
 #include <VBox/stam.h>
+#include <VBox/vusb.h>
 #include <iprt/critsect.h>
 #ifdef IN_RING3
@@ -115 +116 @@
 typedef struct PDMUSBINSINT
 {
+    /** The UUID of this instance. */
+    RTUUID                          Uuid;
     /** Pointer to the next instance.
      * (Head is pointed to by PDM::pUsbInstances.) */
@@ -123 +126 @@
 
     /** Pointer to device structure. */
-    R3PTRTYPE(PPDMUSB)              pUsb;
+    R3PTRTYPE(PPDMUSB)              pUsbDev;
 
     /** Pointer to the VM this instance was created for. */
@@ -131 +134 @@
     /** The per instance device configuration. */
     R3PTRTYPE(PCFGMNODE)            pCfg;
+    /** Same as pCfg if the configuration should be deleted when detaching the device. */
+    R3PTRTYPE(PCFGMNODE)            pCfgDelete;
     /** The global device configuration. */
     R3PTRTYPE(PCFGMNODE)            pCfgGlobal;
 
-    /** Pointer to the USB hub this device is connected to. */
+    /** Pointer to the USB hub this device is attached to.
+     * This is NULL if the device isn't connected to any HUB. */
     R3PTRTYPE(PPDMUSBHUB)           pHub;
     /** The port number that we're connected to. */
@@ -726 +732 @@
      * Note that 1.1 hubs can take on 2.0 devices. */
     uint32_t            fVersions;
-    /** The number of occupied ports. */
+    /** The number of ports on the hub. */
+    uint32_t            cPorts;
+    /** The number of available ports (0..cPorts). */
     uint32_t            cAvailablePorts;
+    /** The driver instance of the hub. */
+    PPDMDRVINS          pDrvIns;
+    /** Copy of the to the registration structure. */
+    PDMUSBHUBREG        Reg;
+
     /** Pointer to the next hub in the list. */
     struct PDMUSBHUB   *pNext;
-    /** The driver instance of the hub.. */
-    PPDMDRVINS          pDrvIns;
-
 } PDMUSBHUB;
 
@@ -872 +882 @@
 PPDMUSB     pdmR3UsbLookup(PVM pVM, const char *pszName);
 int         pdmR3UsbFindLun(PVM pVM, const char *pszDevice, unsigned iInstance, unsigned iLun, PPDMLUN *ppLun);
+int         pdmR3UsbRegisterHub(PVM pVM, PPDMDRVINS pDrvIns, uint32_t fVersions, uint32_t cPorts, PCPDMUSBHUBREG pUsbHubReg, PPCPDMUSBHUBHLP ppUsbHubHlp);
 
 int         pdmR3DrvInit(PVM pVM);
@@ -897 +908 @@
 int         pdmR3ThreadSuspendAll(PVM pVM);
 
+
 #endif /* IN_RING3 */