Changeset 81536 in vbox

Timestamp:

Oct 25, 2019 11:42:49 AM (5 years ago)

Author:

vboxsync

Message:

DevOHCI: Moved the in-flight and done-queue into the OHCIR3 structure. bugref:9218

File:

• trunk/src/VBox/Devices/USB/DevOHCI.cpp (modified) (72 diffs)

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

@@ -337 +337 @@
     uint64_t            cTicksPerUsbTick;
 
+    /** Detected canceled isochronous URBs. */
+    STAMCOUNTER         StatCanceledIsocUrbs;
+    /** Detected canceled general URBs. */
+    STAMCOUNTER         StatCanceledGenUrbs;
+    /** Dropped URBs (endpoint halted, or URB canceled). */
+    STAMCOUNTER         StatDroppedUrbs;
+    /** Profiling ohciR3FrameBoundaryTimer. */
+    STAMPROFILE         StatTimer;
+
+    /** This member and all the following are not part of saved state. */
+    uint64_t            SavedStateEnd;
+
+    /** VM timer frequency used for frame timer calculations. */
+    uint64_t            u64TimerHz;
+    /** Idle detection flag; must be cleared at start of frame */
+    bool                fIdle;
+    /** A flag indicating that the bulk list may have in-flight URBs. */
+    bool                fBulkNeedsCleaning;
+
+    bool                afAlignment3[2];
+    uint32_t            Alignment4;     /**< Align size on a 8 byte boundary. */
+
+    /** Critical section synchronising interrupt handling. */
+    PDMCRITSECT         CsIrq;
+
+    /** The MMIO region handle. */
+    IOMMMIOHANDLE       hMmio;
+} OHCI;
+
+
+/**
+ * OHCI device data, ring-3.
+ */
+typedef struct OHCIR3
+{
+    /** The root hub, ring-3 portion.   */
+    OHCIROOTHUBR3       RootHub;
+    /** Pointer to the device instance - R3 ptr. */
+    PPDMDEVINSR3        pDevInsR3;
+
     /** Number of in-flight TDs. */
     unsigned            cInFlight;
@@ -344 +384 @@
     {
         /** Address of the transport descriptor. */
-        uint32_t    GCPhysTD;
+        uint32_t            GCPhysTD;
         /** Flag indicating an inactive (not-linked) URB. */
-        bool        fInactive;
+        bool                fInactive;
         /** Pointer to the URB. */
         R3PTRTYPE(PVUSBURB) pUrb;
@@ -361 +401 @@
     {
         /** Address of the transport descriptor. */
-        uint32_t GCPhysTD;
+        uint32_t            GCPhysTD;
     } aInDoneQueue[64];
     /** When the tail of the done queue was added.
@@ -371 +411 @@
 #endif
 
-    /** Detected canceled isochronous URBs. */
-    STAMCOUNTER         StatCanceledIsocUrbs;
-    /** Detected canceled general URBs. */
-    STAMCOUNTER         StatCanceledGenUrbs;
-    /** Dropped URBs (endpoint halted, or URB canceled). */
-    STAMCOUNTER         StatDroppedUrbs;
-    /** Profiling ohciR3FrameBoundaryTimer. */
-    STAMPROFILE         StatTimer;
-
-    /** This member and all the following are not part of saved state. */
-    uint64_t            SavedStateEnd;
-
-    /** VM timer frequency used for frame timer calculations. */
-    uint64_t            u64TimerHz;
-    /** Idle detection flag; must be cleared at start of frame */
-    bool                fIdle;
-    /** A flag indicating that the bulk list may have in-flight URBs. */
-    bool                fBulkNeedsCleaning;
-
-    bool                afAlignment3[2];
-    uint32_t            Alignment4;     /**< Align size on a 8 byte boundary. */
-
-    /** Critical section synchronising interrupt handling. */
-    PDMCRITSECT         CsIrq;
-
-    /** The MMIO region handle. */
-    IOMMMIOHANDLE       hMmio;
-} OHCI;
-
-
-/**
- * OHCI device data, ring-3.
- */
-typedef struct OHCIR3
-{
-    /** The root hub, ring-3 portion.   */
-    OHCIROOTHUBR3           RootHub;
-    /** Pointer to the device instance - R3 ptr. */
-    PPDMDEVINSR3            pDevInsR3;
-
-    /** Pointer to state load data. */
-    R3PTRTYPE(POHCILOAD)    pLoad;
-
 #ifdef VBOX_WITH_OHCI_PHYS_READ_CACHE
     /** Last read physical page for caching ED reads in the framer thread. */
-    OHCIPAGECACHE           CacheED;
+    OHCIPAGECACHE       CacheED;
     /** Last read physical page for caching TD reads in the framer thread. */
-    OHCIPAGECACHE           CacheTD;
+    OHCIPAGECACHE       CacheTD;
 #endif
 
     /** Critical section to synchronize the framer and URB completion handler. */
-    RTCRITSECT              CritSect;
+    RTCRITSECT          CritSect;
+
+    /** Pointer to state load data. */
+    R3PTRTYPE(POHCILOAD) pLoad;
 } OHCIR3;
 /** Pointer to ring-3 OHCI state. */
@@ -906 +906 @@
 static DECLCALLBACK(bool)   ohciR3RhXferError(PVUSBIROOTHUBPORT pInterface, PVUSBURB pUrb);
 
-static int                  ohciR3InFlightFind(POHCI pThis, uint32_t GCPhysTD);
+static int                  ohciR3InFlightFind(POHCICC pThisCC, uint32_t GCPhysTD);
 # if defined(VBOX_STRICT) || defined(LOG_ENABLED)
-static int                  ohciR3InDoneQueueFind(POHCI pThis, uint32_t GCPhysTD);
+static int                  ohciR3InDoneQueueFind(POHCICC pThisCC, uint32_t GCPhysTD);
 # endif
 static DECLCALLBACK(void)   ohciR3LoadReattachDevices(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser);
@@ -1262 +1262 @@
      */
     pThisCC->RootHub.pIRhConn->pfnCancelAllUrbs(pThisCC->RootHub.pIRhConn);
-    Assert(pThis->cInFlight == 0);
+    Assert(pThisCC->cInFlight == 0);
 
     /*
@@ -1756 +1756 @@
  * Core TD queue dumper. LOG_ENABLED builds only.
  */
-DECLINLINE(void) ohciR3DumpTdQueueCore(PPDMDEVINS pDevIns, POHCI pThis, uint32_t GCPhysHead, uint32_t GCPhysTail, bool fFull)
+DECLINLINE(void) ohciR3DumpTdQueueCore(PPDMDEVINS pDevIns, POHCICC pThisCC, uint32_t GCPhysHead, uint32_t GCPhysTail, bool fFull)
 {
     uint32_t GCPhys = GCPhysHead;
@@ -1764 +1764 @@
         OHCITD Td;
         Log4(("%#010x%s%s", GCPhys,
-              GCPhys && ohciR3InFlightFind(pThis, GCPhys) >= 0 ? "~" : "",
-              GCPhys && ohciR3InDoneQueueFind(pThis, GCPhys) >= 0 ? "^" : ""));
+              GCPhys && ohciR3InFlightFind(pThisCC, GCPhys) >= 0 ? "~" : "",
+              GCPhys && ohciR3InDoneQueueFind(pThisCC, GCPhys) >= 0 ? "^" : ""));
         if (GCPhys == 0 || GCPhys == GCPhysTail)
             break;
@@ -1793 +1793 @@
  * Dumps a TD queue. LOG_ENABLED builds only.
  */
-DECLINLINE(void) ohciR3DumpTdQueue(PPDMDEVINS pDevIns, POHCI pThis, uint32_t GCPhysHead, const char *pszMsg)
+DECLINLINE(void) ohciR3DumpTdQueue(PPDMDEVINS pDevIns, POHCICC pThisCC, uint32_t GCPhysHead, const char *pszMsg)
 {
     if (pszMsg)
         Log4(("%s: ", pszMsg));
-    ohciR3DumpTdQueueCore(pDevIns, pThis, GCPhysHead, 0, true);
+    ohciR3DumpTdQueueCore(pDevIns, pThisCC, GCPhysHead, 0, true);
     Log4(("\n"));
 }
@@ -1804 +1804 @@
  * Core ITD queue dumper. LOG_ENABLED builds only.
  */
-DECLINLINE(void) ohciR3DumpITdQueueCore(PPDMDEVINS pDevIns, POHCI pThis, uint32_t GCPhysHead, uint32_t GCPhysTail, bool fFull)
+DECLINLINE(void) ohciR3DumpITdQueueCore(PPDMDEVINS pDevIns, POHCICC pThisCC, uint32_t GCPhysHead, uint32_t GCPhysTail, bool fFull)
 {
     RT_NOREF(fFull);
@@ -1813 +1813 @@
         OHCIITD ITd;
         Log4(("%#010x%s%s", GCPhys,
-              GCPhys && ohciR3InFlightFind(pThis, GCPhys) >= 0 ? "~" : "",
-              GCPhys && ohciR3InDoneQueueFind(pThis, GCPhys) >= 0 ? "^" : ""));
+              GCPhys && ohciR3InFlightFind(pThisCC, GCPhys) >= 0 ? "~" : "",
+              GCPhys && ohciR3InDoneQueueFind(pThisCC, GCPhys) >= 0 ? "^" : ""));
         if (GCPhys == 0 || GCPhys == GCPhysTail)
             break;
@@ -1842 +1842 @@
  * Dumps a ED list. LOG_ENABLED builds only.
  */
-DECLINLINE(void) ohciR3DumpEdList(PPDMDEVINS pDevIns, POHCI pThis, uint32_t GCPhysHead, const char *pszMsg, bool fTDs)
+DECLINLINE(void) ohciR3DumpEdList(PPDMDEVINS pDevIns, POHCICC pThisCC, uint32_t GCPhysHead, const char *pszMsg, bool fTDs)
 {
     RT_NOREF(fTDs);
@@ -1876 +1876 @@
         {
             if (Ed.hwinfo & ED_HWINFO_ISO)
-                ohciR3DumpITdQueueCore(pDevIns, pThis, Ed.HeadP & ED_PTR_MASK, Ed.TailP & ED_PTR_MASK, false);
+                ohciR3DumpITdQueueCore(pDevIns, pThisCC, Ed.HeadP & ED_PTR_MASK, Ed.TailP & ED_PTR_MASK, false);
             else
-                ohciR3DumpTdQueueCore(pDevIns, pThis, Ed.HeadP & ED_PTR_MASK, Ed.TailP & ED_PTR_MASK, false);
+                ohciR3DumpTdQueueCore(pDevIns, pThisCC, Ed.HeadP & ED_PTR_MASK, Ed.TailP & ED_PTR_MASK, false);
             Log4(("}"));
         }
@@ -1892 +1892 @@
 
 
-DECLINLINE(int) ohciR3InFlightFindFree(POHCI pThis, const int iStart)
+DECLINLINE(int) ohciR3InFlightFindFree(POHCICC pThisCC, const int iStart)
 {
     unsigned i = iStart;
-    while (i < RT_ELEMENTS(pThis->aInFlight))
-    {
-        if (pThis->aInFlight[i].GCPhysTD == 0)
+    while (i < RT_ELEMENTS(pThisCC->aInFlight))
+    {
+        if (pThisCC->aInFlight[i].GCPhysTD == 0)
             return i;
         i++;
@@ -1904 +1904 @@
     while (i-- > 0)
     {
-        if (pThis->aInFlight[i].GCPhysTD == 0)
+        if (pThisCC->aInFlight[i].GCPhysTD == 0)
             return i;
     }
@@ -1914 +1914 @@
  * Record an in-flight TD.
  *
- * @param   pThis       OHCI instance data.
+ * @param   pThis       OHCI instance data, shared edition.
+ * @param   pThisCC     OHCI instance data, ring-3 edition.
  * @param   GCPhysTD    Physical address of the TD.
  * @param   pUrb        The URB.
  */
-static void ohciR3InFlightAdd(POHCI pThis, uint32_t GCPhysTD, PVUSBURB pUrb)
-{
-    int i = ohciR3InFlightFindFree(pThis, (GCPhysTD >> 4) % RT_ELEMENTS(pThis->aInFlight));
+static void ohciR3InFlightAdd(POHCI pThis, POHCICC pThisCC, uint32_t GCPhysTD, PVUSBURB pUrb)
+{
+    int i = ohciR3InFlightFindFree(pThisCC, (GCPhysTD >> 4) % RT_ELEMENTS(pThisCC->aInFlight));
     if (i >= 0)
     {
@@ -1926 +1927 @@
         pUrb->pHci->u32FrameNo = pThis->HcFmNumber;
 # endif
-        pThis->aInFlight[i].GCPhysTD = GCPhysTD;
-        pThis->aInFlight[i].pUrb = pUrb;
-        pThis->cInFlight++;
+        pThisCC->aInFlight[i].GCPhysTD = GCPhysTD;
+        pThisCC->aInFlight[i].pUrb = pUrb;
+        pThisCC->cInFlight++;
         return;
     }
-    AssertMsgFailed(("Out of space cInFlight=%d!\n", pThis->cInFlight));
+    AssertMsgFailed(("Out of space cInFlight=%d!\n", pThisCC->cInFlight));
+    RT_NOREF(pThis);
 }
 
@@ -1938 +1940 @@
  * Record in-flight TDs for an URB.
  *
- * @param   pThis       OHCI instance data.
+ * @param   pThis       OHCI instance data, shared edition.
+ * @param   pThisCC     OHCI instance data, ring-3 edition.
  * @param   pUrb        The URB.
  */
-static void ohciR3InFlightAddUrb(POHCI pThis, PVUSBURB pUrb)
+static void ohciR3InFlightAddUrb(POHCI pThis, POHCICC pThisCC, PVUSBURB pUrb)
 {
     for (unsigned iTd = 0; iTd < pUrb->pHci->cTds; iTd++)
-        ohciR3InFlightAdd(pThis, pUrb->paTds[iTd].TdAddr, pUrb);
+        ohciR3InFlightAdd(pThis, pThisCC, pUrb->paTds[iTd].TdAddr, pUrb);
 }
 
@@ -1953 +1956 @@
  * @returns Index of the record.
  * @returns -1 if not found.
- * @param   pThis       OHCI instance data.
+ * @param   pThisCC     OHCI instance data, ring-3 edition.
  * @param   GCPhysTD    Physical address of the TD.
  * @remark  This has to be fast.
  */
-static int ohciR3InFlightFind(POHCI pThis, uint32_t GCPhysTD)
-{
-    unsigned cLeft = pThis->cInFlight;
-    unsigned i = (GCPhysTD >> 4) % RT_ELEMENTS(pThis->aInFlight);
+static int ohciR3InFlightFind(POHCICC pThisCC, uint32_t GCPhysTD)
+{
+    unsigned cLeft = pThisCC->cInFlight;
+    unsigned i = (GCPhysTD >> 4) % RT_ELEMENTS(pThisCC->aInFlight);
     const int iLast = i;
-    while (i < RT_ELEMENTS(pThis->aInFlight))
-    {
-        if (pThis->aInFlight[i].GCPhysTD == GCPhysTD)
+    while (i < RT_ELEMENTS(pThisCC->aInFlight))
+    {
+        if (pThisCC->aInFlight[i].GCPhysTD == GCPhysTD)
             return i;
-        if (pThis->aInFlight[i].GCPhysTD)
+        if (pThisCC->aInFlight[i].GCPhysTD)
             if (cLeft-- <= 1)
                 return -1;
@@ -1974 +1977 @@
     while (i-- > 0)
     {
-        if (pThis->aInFlight[i].GCPhysTD == GCPhysTD)
+        if (pThisCC->aInFlight[i].GCPhysTD == GCPhysTD)
             return i;
-        if (pThis->aInFlight[i].GCPhysTD)
+        if (pThisCC->aInFlight[i].GCPhysTD)
             if (cLeft-- <= 1)
                 return -1;
@@ -1988 +1991 @@
  *
  * @returns true if in flight, false if not.
- * @param   pThis       OHCI instance data.
+ * @param   pThisCC     OHCI instance data, ring-3 edition.
  * @param   GCPhysTD    Physical address of the TD.
  */
-static bool ohciR3IsTdInFlight(POHCI pThis, uint32_t GCPhysTD)
-{
-    return ohciR3InFlightFind(pThis, GCPhysTD) >= 0;
+static bool ohciR3IsTdInFlight(POHCICC pThisCC, uint32_t GCPhysTD)
+{
+    return ohciR3InFlightFind(pThisCC, GCPhysTD) >= 0;
 }
 
@@ -2001 +2004 @@
  * @returns pointer to URB if TD is in flight.
  * @returns NULL if not in flight.
- * @param   pThis       OHCI instance data.
+ * @param   pThisCC     OHCI instance data, ring-3 edition.
  * @param   GCPhysTD    Physical address of the TD.
  */
-static PVUSBURB ohciR3TdInFlightUrb(POHCI pThis, uint32_t GCPhysTD)
+static PVUSBURB ohciR3TdInFlightUrb(POHCICC pThisCC, uint32_t GCPhysTD)
 {
     int i;
 
-    i = ohciR3InFlightFind(pThis, GCPhysTD);
+    i = ohciR3InFlightFind(pThisCC, GCPhysTD);
     if ( i >= 0 )
-        return pThis->aInFlight[i].pUrb;
+        return pThisCC->aInFlight[i].pUrb;
     return NULL;
 }
@@ -2019 +2022 @@
  * @returns 0 if found. For logged builds this is the number of frames the TD has been in-flight.
  * @returns -1 if not found.
- * @param   pThis       OHCI instance data.
+ * @param   pThis       OHCI instance data, shared edition (for logging).
+ * @param   pThisCC     OHCI instance data, ring-3 edition.
  * @param   GCPhysTD    Physical address of the TD.
  */
-static int ohciR3InFlightRemove(POHCI pThis, uint32_t GCPhysTD)
-{
-    int i = ohciR3InFlightFind(pThis, GCPhysTD);
+static int ohciR3InFlightRemove(POHCI pThis, POHCICC pThisCC, uint32_t GCPhysTD)
+{
+    int i = ohciR3InFlightFind(pThisCC, GCPhysTD);
     if (i >= 0)
     {
 # ifdef LOG_ENABLED
-        const int cFramesInFlight = pThis->HcFmNumber - pThis->aInFlight[i].pUrb->pHci->u32FrameNo;
+        const int cFramesInFlight = pThis->HcFmNumber - pThisCC->aInFlight[i].pUrb->pHci->u32FrameNo;
 # else
-        const int cFramesInFlight = 0;
+        const int cFramesInFlight = 0; RT_NOREF(pThis);
 # endif
         Log2(("ohciR3InFlightRemove: reaping TD=%#010x %d frames (%#010x-%#010x)\n",
-              GCPhysTD, cFramesInFlight, pThis->aInFlight[i].pUrb->pHci->u32FrameNo, pThis->HcFmNumber));
-        pThis->aInFlight[i].GCPhysTD = 0;
-        pThis->aInFlight[i].pUrb = NULL;
-        pThis->cInFlight--;
+              GCPhysTD, cFramesInFlight, pThisCC->aInFlight[i].pUrb->pHci->u32FrameNo, pThis->HcFmNumber));
+        pThisCC->aInFlight[i].GCPhysTD = 0;
+        pThisCC->aInFlight[i].pUrb = NULL;
+        pThisCC->cInFlight--;
         return cFramesInFlight;
     }
@@ -2049 +2053 @@
  * @returns 0 if found. For logged builds this is the number of frames the TD has been in-flight.
  * @returns -1 if not found.
- * @param   pThis       OHCI instance data.
+ * @param   pThis       OHCI instance data, shared edition (for logging).
+ * @param   pThisCC     OHCI instance data, ring-3 edition.
  * @param   pUrb        The URB.
  */
-static int ohciR3InFlightRemoveUrb(POHCI pThis, PVUSBURB pUrb)
-{
-    int cFramesInFlight = ohciR3InFlightRemove(pThis, pUrb->paTds[0].TdAddr);
+static int ohciR3InFlightRemoveUrb(POHCI pThis, POHCICC pThisCC, PVUSBURB pUrb)
+{
+    int cFramesInFlight = ohciR3InFlightRemove(pThis, pThisCC, pUrb->paTds[0].TdAddr);
     if (pUrb->pHci->cTds > 1)
     {
         for (unsigned iTd = 1; iTd < pUrb->pHci->cTds; iTd++)
-            if (ohciR3InFlightRemove(pThis, pUrb->paTds[iTd].TdAddr) < 0)
+            if (ohciR3InFlightRemove(pThis, pThisCC, pUrb->paTds[iTd].TdAddr) < 0)
                 cFramesInFlight = -1;
     }
@@ -2069 +2074 @@
 /**
  * Empties the in-done-queue.
- * @param   pThis       OHCI instance data.
- */
-static void ohciR3InDoneQueueZap(POHCI pThis)
-{
-    pThis->cInDoneQueue = 0;
+ * @param   pThisCC     OHCI instance data, ring-3 edition.
+ */
+static void ohciR3InDoneQueueZap(POHCICC pThisCC)
+{
+    pThisCC->cInDoneQueue = 0;
 }
 
@@ -2080 +2085 @@
  * @returns >= 0 on success.
  * @returns -1 if not found.
- * @param   pThis       OHCI instance data.
+ * @param   pThisCC     OHCI instance data, ring-3 edition.
  * @param   GCPhysTD    Physical address of the TD.
  */
-static int ohciR3InDoneQueueFind(POHCI pThis, uint32_t GCPhysTD)
-{
-    unsigned i = pThis->cInDoneQueue;
+static int ohciR3InDoneQueueFind(POHCICC pThisCC, uint32_t GCPhysTD)
+{
+    unsigned i = pThisCC->cInDoneQueue;
     while (i-- > 0)
-        if (pThis->aInDoneQueue[i].GCPhysTD == GCPhysTD)
+        if (pThisCC->aInDoneQueue[i].GCPhysTD == GCPhysTD)
             return i;
     return -1;
@@ -2094 +2099 @@
 /**
  * Checks that the specified TD is not in the done queue.
- * @param   pThis       OHCI instance data.
+ * @param   pThisCC     OHCI instance data, ring-3 edition.
  * @param   GCPhysTD    Physical address of the TD.
  */
-static bool ohciR3InDoneQueueCheck(POHCI pThis, uint32_t GCPhysTD)
-{
-    int i = ohciR3InDoneQueueFind(pThis, GCPhysTD);
+static bool ohciR3InDoneQueueCheck(POHCICC pThisCC, uint32_t GCPhysTD)
+{
+    int i = ohciR3InDoneQueueFind(pThisCC, GCPhysTD);
 #  if 0
     /* This condition has been observed with the USB tablet emulation or with
@@ -2120 +2125 @@
 /**
  * Adds a TD to the in-done-queue tracking, checking that it's not there already.
- * @param   pThis       OHCI instance data.
+ * @param   pThisCC     OHCI instance data, ring-3 edition.
  * @param   GCPhysTD    Physical address of the TD.
  */
-static void ohciR3InDoneQueueAdd(POHCI pThis, uint32_t GCPhysTD)
-{
-    Assert(pThis->cInDoneQueue + 1 <= RT_ELEMENTS(pThis->aInDoneQueue));
-    if (ohciR3InDoneQueueCheck(pThis, GCPhysTD))
-        pThis->aInDoneQueue[pThis->cInDoneQueue++].GCPhysTD = GCPhysTD;
+static void ohciR3InDoneQueueAdd(POHCICC pThisCC, uint32_t GCPhysTD)
+{
+    Assert(pThisCC->cInDoneQueue + 1 <= RT_ELEMENTS(pThisCC->aInDoneQueue));
+    if (ohciR3InDoneQueueCheck(pThisCC, GCPhysTD))
+        pThisCC->aInDoneQueue[pThisCC->cInDoneQueue++].GCPhysTD = GCPhysTD;
 }
 #  endif /* VBOX_STRICT */
@@ -2566 +2571 @@
  * In general, all URBs should have status OK.
  */
-static void ohciR3RhXferCompleteIsochronousURB(PPDMDEVINS pDevIns, POHCI pThis, PVUSBURB pUrb /*, POHCIED pEd , int cFmAge*/)
+static void ohciR3RhXferCompleteIsochronousURB(PPDMDEVINS pDevIns, POHCI pThis, POHCICC pThisCC, PVUSBURB pUrb
+                                               /*, POHCIED pEd , int cFmAge*/)
 {
     /*
@@ -2686 +2692 @@
 # ifdef LOG_ENABLED
         if (!pThis->done)
-            pThis->u32FmDoneQueueTail = pThis->HcFmNumber;
+            pThisCC->u32FmDoneQueueTail = pThis->HcFmNumber;
 #  ifdef VBOX_STRICT
-        ohciR3InDoneQueueAdd(pThis, ITdAddr);
+        ohciR3InDoneQueueAdd(pThisCC, ITdAddr);
 #  endif
 # endif
@@ -2712 +2718 @@
         ohciR3WriteITd(pDevIns, pThis, ITdAddr, pITd, "retired");
     }
+    RT_NOREF(pThisCC);
 }
 
@@ -2719 +2726 @@
  * a URB made up of general TDs.
  */
-static void ohciR3RhXferCompleteGeneralURB(PPDMDEVINS pDevIns, POHCI pThis, PVUSBURB pUrb, POHCIED pEd, int cFmAge)
+static void ohciR3RhXferCompleteGeneralURB(PPDMDEVINS pDevIns, POHCI pThis, POHCICC pThisCC, PVUSBURB pUrb,
+                                           POHCIED pEd, int cFmAge)
 {
     RT_NOREF(cFmAge);
@@ -2836 +2844 @@
 # ifdef LOG_ENABLED
         if (!pThis->done)
-            pThis->u32FmDoneQueueTail = pThis->HcFmNumber;
+            pThisCC->u32FmDoneQueueTail = pThis->HcFmNumber;
 #  ifdef VBOX_STRICT
-        ohciR3InDoneQueueAdd(pThis, TdAddr);
+        ohciR3InDoneQueueAdd(pThisCC, TdAddr);
 #  endif
 # endif
@@ -2858 +2866 @@
             break;
     }
+    RT_NOREF(pThisCC);
 }
 
@@ -2880 +2889 @@
     ohciR3Lock(pThisCC);
 
-    int cFmAge = ohciR3InFlightRemoveUrb(pThis, pUrb);
+    int cFmAge = ohciR3InFlightRemoveUrb(pThis, pThisCC, pUrb);
 
     /* Do nothing requiring memory access if the HC encountered an unrecoverable error. */
@@ -2936 +2945 @@
          */
         if (pUrb->enmType == VUSBXFERTYPE_ISOC)
-            ohciR3RhXferCompleteIsochronousURB(pDevIns, pThis, pUrb /*, &Ed , cFmAge*/);
+            ohciR3RhXferCompleteIsochronousURB(pDevIns, pThis, pThisCC, pUrb /*, &Ed , cFmAge*/);
         else
-            ohciR3RhXferCompleteGeneralURB(pDevIns, pThis, pUrb, &Ed, cFmAge);
+            ohciR3RhXferCompleteGeneralURB(pDevIns, pThis, pThisCC, pUrb, &Ed, cFmAge);
 
         /* finally write back the endpoint descriptor. */
@@ -3104 +3113 @@
      * Submit the URB.
      */
-    ohciR3InFlightAdd(pThis, TdAddr, pUrb);
+    ohciR3InFlightAdd(pThis, pThisCC, TdAddr, pUrb);
     Log(("%s: ohciR3ServiceTd: submitting TdAddr=%#010x EdAddr=%#010x cbData=%#x\n",
          pUrb->pszDesc, TdAddr, EdAddr, pUrb->cbData));
@@ -3117 +3126 @@
     Log(("ohciR3ServiceTd: failed submitting TdAddr=%#010x EdAddr=%#010x pUrb=%p!!\n",
          TdAddr, EdAddr, pUrb));
-    ohciR3InFlightRemove(pThis, TdAddr);
+    ohciR3InFlightRemove(pThis, pThisCC, TdAddr);
     VUSBIRhFreeUrb(pThisCC->RootHub.pIRhConn, pUrb);
     return false;
@@ -3133 +3142 @@
      */
     uint32_t TdAddr = pEd->HeadP & ED_PTR_MASK;
-    if (ohciR3IsTdInFlight(pThis, TdAddr))
+    if (ohciR3IsTdInFlight(pThisCC, TdAddr))
         return false;
 # if defined(VBOX_STRICT) || defined(LOG_ENABLED)
-    ohciR3InDoneQueueCheck(pThis, TdAddr);
+    ohciR3InDoneQueueCheck(pThisCC, TdAddr);
 # endif
     return ohciR3ServiceTd(pDevIns, pThis, pThisCC, enmType, pEd, EdAddr, TdAddr, &TdAddr, pszListName);
@@ -3277 +3286 @@
      * Submit the URB.
      */
-    ohciR3InFlightAddUrb(pThis, pUrb);
+    ohciR3InFlightAddUrb(pThis, pThisCC, pUrb);
     Log(("%s: ohciR3ServiceTdMultiple: submitting cbData=%#x EdAddr=%#010x cTds=%d TdAddr0=%#010x\n",
          pUrb->pszDesc, pUrb->cbData, EdAddr, cTds, TdAddr));
@@ -3289 +3298 @@
     Log(("ohciR3ServiceTdMultiple: failed submitting pUrb=%p cbData=%#x EdAddr=%#010x cTds=%d TdAddr0=%#010x - rc=%Rrc\n",
          pUrb, cbTotal, EdAddr, cTds, TdAddr, rc));
-    ohciR3InFlightRemoveUrb(pThis, pUrb);
+    ohciR3InFlightRemoveUrb(pThis, pThisCC, pUrb);
     VUSBIRhFreeUrb(pThisCC->RootHub.pIRhConn, pUrb);
     return false;
@@ -3298 +3307 @@
  * Service the head TD of an endpoint.
  */
-static bool ohciR3ServiceHeadTdMultiple(PPDMDEVINS pDevIns, POHCI pThis, VUSBXFERTYPE enmType, PCOHCIED pEd, uint32_t EdAddr,
-                                        const char *pszListName)
+static bool ohciR3ServiceHeadTdMultiple(PPDMDEVINS pDevIns, POHCI pThis, POHCICC pThisCC, VUSBXFERTYPE enmType,
+                                        PCOHCIED pEd, uint32_t EdAddr, const char *pszListName)
 {
     /*
@@ -3305 +3314 @@
      */
     uint32_t TdAddr = pEd->HeadP & ED_PTR_MASK;
-    if (ohciR3IsTdInFlight(pThis, TdAddr))
+    if (ohciR3IsTdInFlight(pThisCC, TdAddr))
         return false;
 # if defined(VBOX_STRICT) || defined(LOG_ENABLED)
-    ohciR3InDoneQueueCheck(pThis, TdAddr);
+    ohciR3InDoneQueueCheck(pThisCC, TdAddr);
 # endif
     return ohciR3ServiceTdMultiple(pDevIns, pThis, enmType, pEd, EdAddr, TdAddr, &TdAddr, pszListName);
@@ -3318 +3327 @@
  * that belongs to the past.
  */
-static bool ohciR3ServiceIsochronousTdUnlink(PPDMDEVINS pDevIns, POHCI pThis, POHCIITD pITd, uint32_t ITdAddr,
+static bool ohciR3ServiceIsochronousTdUnlink(PPDMDEVINS pDevIns, POHCI pThis, POHCICC pThisCC, POHCIITD pITd, uint32_t ITdAddr,
                                              uint32_t ITdAddrPrev, PVUSBURB pUrb, POHCIED pEd, uint32_t EdAddr)
 {
@@ -3331 +3340 @@
     {
         /* Get validate the previous TD */
-        int iInFlightPrev = ohciR3InFlightFind(pThis, ITdAddrPrev);
+        int iInFlightPrev = ohciR3InFlightFind(pThisCC, ITdAddrPrev);
         AssertMsgReturn(iInFlightPrev >= 0, ("ITdAddr=%#RX32\n", ITdAddrPrev), false);
-        PVUSBURB pUrbPrev = pThis->aInFlight[iInFlightPrev].pUrb;
+        PVUSBURB pUrbPrev = pThisCC->aInFlight[iInFlightPrev].pUrb;
         if (ohciR3HasUrbBeenCanceled(pDevIns, pThis, pUrbPrev, pEd)) /* ensures the copy is correct. */
             return false;
@@ -3523 +3532 @@
      * Submit the URB.
      */
-    ohciR3InFlightAdd(pThis, ITdAddr, pUrb);
+    ohciR3InFlightAdd(pThis, pThisCC, ITdAddr, pUrb);
     Log(("%s: ohciR3ServiceIsochronousTd: submitting cbData=%#x cIsocPkts=%d EdAddr=%#010x TdAddr=%#010x SF=%#x (%#x)\n",
          pUrb->pszDesc, pUrb->cbData, pUrb->cIsocPkts, EdAddr, ITdAddr, pITd->HwInfo & ITD_HWINFO_SF, pThis->HcFmNumber));
@@ -3535 +3544 @@
     Log(("ohciR3ServiceIsochronousTd: failed submitting pUrb=%p cbData=%#x EdAddr=%#010x cTds=%d ITdAddr0=%#010x - rc=%Rrc\n",
          pUrb, cbTotal, EdAddr, 1, ITdAddr, rc));
-    ohciR3InFlightRemove(pThis, ITdAddr);
+    ohciR3InFlightRemove(pThis, pThisCC, ITdAddr);
     VUSBIRhFreeUrb(pThisCC->RootHub.pIRhConn, pUrb);
     return false;
@@ -3602 +3611 @@
                 &&  (uint16_t)u32NextFrame != (uint16_t)(ITd.HwInfo & ITD_HWINFO_SF))
                 break;
-            if (ohciR3InFlightFind(pThis, ITdAddr) < 0)
+            if (ohciR3InFlightFind(pThisCC, ITdAddr) < 0)
                 if (!ohciR3ServiceIsochronousTd(pDevIns, pThis, pThisCC, &ITd, ITdAddr, R < 0 ? 0 : R, pEd, EdAddr))
                     break;
@@ -3624 +3633 @@
              * time will show.
              */
-            int iInFlight = ohciR3InFlightFind(pThis, ITdAddr);
+            int iInFlight = ohciR3InFlightFind(pThisCC, ITdAddr);
             if (iInFlight >= 0)
                 ITdAddrPrev = ITdAddr;
-            else if (!ohciR3ServiceIsochronousTdUnlink(pDevIns, pThis, &ITd, ITdAddr, ITdAddrPrev, NULL, pEd, EdAddr))
+            else if (!ohciR3ServiceIsochronousTdUnlink(pDevIns, pThis, pThisCC, &ITd, ITdAddr, ITdAddrPrev, NULL, pEd, EdAddr))
             {
                 Log(("ohciR3ServiceIsochronousEndpoint: Failed unlinking old ITD.\n"));
@@ -3696 +3705 @@
 # ifdef LOG_ENABLED
     if (g_fLogBulkEPs)
-        ohciR3DumpEdList(pDevIns, pThis, pThis->bulk_head, "Bulk before", true);
+        ohciR3DumpEdList(pDevIns, pThisCC, pThis->bulk_head, "Bulk before", true);
     if (pThis->bulk_cur)
         Log(("ohciR3ServiceBulkList: bulk_cur=%#010x before listprocessing!!! HCD have positioned us!!!\n", pThis->bulk_cur));
@@ -3735 +3744 @@
              * on a bulk endpoint.
              */
-            ohciR3ServiceHeadTdMultiple(pDevIns, pThis, VUSBXFERTYPE_BULK, &Ed, EdAddr, "Bulk");
+            ohciR3ServiceHeadTdMultiple(pDevIns, pThis, pThisCC, VUSBXFERTYPE_BULK, &Ed, EdAddr, "Bulk");
 # else
             /*
@@ -3772 +3781 @@
                  */
                 uint32_t TdAddr = Ed.HeadP & ED_PTR_MASK;
-                PVUSBURB pUrb = ohciR3TdInFlightUrb(pThis, TdAddr);
+                PVUSBURB pUrb = ohciR3TdInFlightUrb(pThisCC, TdAddr);
                 if (pUrb)
                     pThisCC->RootHub.pIRhConn->pfnCancelUrbsEp(pThisCC->RootHub.pIRhConn, pUrb);
@@ -3785 +3794 @@
 # ifdef LOG_ENABLED
     if (g_fLogBulkEPs)
-        ohciR3DumpEdList(pDevIns, pThis, pThis->bulk_head, "Bulk after ", true);
+        ohciR3DumpEdList(pDevIns, pThisCC, pThis->bulk_head, "Bulk after ", true);
 # endif
 }
@@ -3801 +3810 @@
 # ifdef LOG_ENABLED
     if (g_fLogBulkEPs)
-        ohciR3DumpEdList(pDevIns, pThis, pThis->bulk_head, "Bulk before", true);
+        ohciR3DumpEdList(pDevIns, pThisCC, pThis->bulk_head, "Bulk before", true);
     if (pThis->bulk_cur)
         Log(("ohciR3UndoBulkList: bulk_cur=%#010x before list processing!!! HCD has positioned us!!!\n", pThis->bulk_cur));
@@ -3819 +3828 @@
         {
             uint32_t TdAddr = Ed.HeadP & ED_PTR_MASK;
-            if (ohciR3IsTdInFlight(pThis, TdAddr))
+            if (ohciR3IsTdInFlight(pThisCC, TdAddr))
             {
                 LogFlow(("ohciR3UndoBulkList: Ed=%#010RX32 Ed.TailP=%#010RX32 UNDO\n", EdAddr, Ed.TailP));
-                PVUSBURB pUrb = ohciR3TdInFlightUrb(pThis, TdAddr);
+                PVUSBURB pUrb = ohciR3TdInFlightUrb(pThisCC, TdAddr);
                 if (pUrb)
                     pThisCC->RootHub.pIRhConn->pfnCancelUrbsEp(pThisCC->RootHub.pIRhConn, pUrb);
@@ -3843 +3852 @@
 # ifdef LOG_ENABLED
     if (g_fLogControlEPs)
-        ohciR3DumpEdList(pDevIns, pThis, pThis->ctrl_head, "Ctrl before", true);
+        ohciR3DumpEdList(pDevIns, pThisCC, pThis->ctrl_head, "Ctrl before", true);
     if (pThis->ctrl_cur)
         Log(("ohciR3ServiceCtrlList: ctrl_cur=%010x before list processing!!! HCD have positioned us!!!\n", pThis->ctrl_cur));
@@ -3879 +3888 @@
             {
                 if (    !ohciR3ServiceHeadTd(pDevIns, pThis, pThisCC, VUSBXFERTYPE_CTRL, &Ed, EdAddr, "Control")
-                    ||  ohciR3IsTdInFlight(pThis, Ed.HeadP & ED_PTR_MASK))
+                    ||  ohciR3IsTdInFlight(pThisCC, Ed.HeadP & ED_PTR_MASK))
                 {
                     pThis->status |= OHCI_STATUS_CLF;
@@ -3899 +3908 @@
 # ifdef LOG_ENABLED
     if (g_fLogControlEPs)
-        ohciR3DumpEdList(pDevIns, pThis, pThis->ctrl_head, "Ctrl after ", true);
+        ohciR3DumpEdList(pDevIns, pThisCC, pThis->ctrl_head, "Ctrl after ", true);
 # endif
 }
@@ -3926 +3935 @@
         char sz[48];
         RTStrPrintf(sz, sizeof(sz), "Int%02x before", iList);
-        ohciR3DumpEdList(pDevIns, pThis, EdAddrHead, sz, true);
+        ohciR3DumpEdList(pDevIns, pThisCC, EdAddrHead, sz, true);
     }
 # endif
@@ -3954 +3963 @@
                  * Presently we will only process the head URB on an interrupt endpoint.
                  */
-                ohciR3ServiceHeadTdMultiple(pDevIns, pThis, VUSBXFERTYPE_INTR, &Ed, EdAddr, "Periodic");
+                ohciR3ServiceHeadTdMultiple(pDevIns, pThis, pThisCC, VUSBXFERTYPE_INTR, &Ed, EdAddr, "Periodic");
             }
             else if (pThis->ctl & OHCI_CTL_IE)
@@ -3975 +3984 @@
                  */
                 uint32_t TdAddr = Ed.HeadP & ED_PTR_MASK;
-                PVUSBURB pUrb = ohciR3TdInFlightUrb(pThis, TdAddr);
+                PVUSBURB pUrb = ohciR3TdInFlightUrb(pThisCC, TdAddr);
                 if (pUrb)
                     pThisCC->RootHub.pIRhConn->pfnCancelUrbsEp(pThisCC->RootHub.pIRhConn, pUrb);
@@ -3989 +3998 @@
         char sz[48];
         RTStrPrintf(sz, sizeof(sz), "Int%02x after ", iList);
-        ohciR3DumpEdList(pDevIns, pThis, EdAddrHead, sz, true);
+        ohciR3DumpEdList(pDevIns, pThisCC, EdAddrHead, sz, true);
     }
 # endif
@@ -4000 +4009 @@
  * @param   pThis   The OHCI instance data.
  */
-static void ohciR3UpdateHCCA(PPDMDEVINS pDevIns, POHCI pThis)
+static void ohciR3UpdateHCCA(PPDMDEVINS pDevIns, POHCI pThis, POHCICC pThisCC)
 {
     OCHIHCCA hcca;
@@ -4023 +4032 @@
 
         Log(("ohci: Writeback Done (%#010x) on frame %#x (age %#x)\n", hcca.done,
-             pThis->HcFmNumber, pThis->HcFmNumber - pThis->u32FmDoneQueueTail));
+             pThis->HcFmNumber, pThis->HcFmNumber - pThisCC->u32FmDoneQueueTail));
 # ifdef LOG_ENABLED
-        ohciR3DumpTdQueue(pDevIns, pThis, hcca.done & ED_PTR_MASK, "DoneQueue");
+        ohciR3DumpTdQueue(pDevIns, pThisCC, hcca.done & ED_PTR_MASK, "DoneQueue");
 # endif
         Assert(RT_OFFSETOF(OCHIHCCA, done) == 4);
 # if defined(VBOX_STRICT) || defined(LOG_ENABLED)
-        ohciR3InDoneQueueZap(pThis);
+        ohciR3InDoneQueueZap(pThisCC);
 # endif
         fWriteDoneHeadInterrupt = true;
@@ -4038 +4047 @@
     if (fWriteDoneHeadInterrupt)
         ohciR3SetInterrupt(pDevIns, pThis, OHCI_INTR_WRITE_DONE_HEAD);
+    RT_NOREF(pThisCC);
 }
 
@@ -4047 +4057 @@
  * they might "steal" data destined for another URB.
  */
-static void ohciR3CancelOrphanedURBs(PPDMDEVINS pDevIns, POHCI pThis)
+static void ohciR3CancelOrphanedURBs(PPDMDEVINS pDevIns, POHCI pThis, POHCICC pThisCC)
 {
     bool fValidHCCA = !(    pThis->hcca >= OHCI_HCCA_MASK
@@ -4059 +4069 @@
      * there's nothing to do.
      */
-    if (!fValidHCCA || !pThis->cInFlight)
+    if (!fValidHCCA || !pThisCC->cInFlight)
         return;
 
     /* Initially mark all in-flight URBs as inactive. */
-    for (i = 0, cLeft = pThis->cInFlight; cLeft && i < RT_ELEMENTS(pThis->aInFlight); i++)
-    {
-        if (pThis->aInFlight[i].pUrb)
+    for (i = 0, cLeft = pThisCC->cInFlight; cLeft && i < RT_ELEMENTS(pThisCC->aInFlight); i++)
+    {
+        if (pThisCC->aInFlight[i].pUrb)
         {
-            pThis->aInFlight[i].fInactive = true;
+            pThisCC->aInFlight[i].fInactive = true;
             cLeft--;
         }
@@ -4077 +4087 @@
     uint32_t au32HCCA[OHCI_HCCA_NUM_INTR];
     ohciR3GetDWords(pDevIns, pThis->hcca, au32HCCA, OHCI_HCCA_NUM_INTR);
-    POHCICC pThisCC = PDMINS_2_DATA_CC(pDevIns, POHCICC);
 # endif
 
@@ -4119 +4128 @@
                 {
                     ohciR3ReadTd(pDevIns, TdAddr, &Td);
-                    j = ohciR3InFlightFind(pThis, TdAddr);
+                    j = ohciR3InFlightFind(pThisCC, TdAddr);
                     if (j > -1)
-                        pThis->aInFlight[j].fInactive = false;
+                        pThisCC->aInFlight[j].fInactive = false;
                     TdAddr = Td.NextTD & ED_PTR_MASK;
                     /* See #8125.
@@ -4144 +4153 @@
      * to be canceled.
      */
-    for (i = 0, cLeft = pThis->cInFlight; cLeft && i < RT_ELEMENTS(pThis->aInFlight); i++)
-    {
-        if (pThis->aInFlight[i].pUrb)
+    for (i = 0, cLeft = pThisCC->cInFlight; cLeft && i < RT_ELEMENTS(pThisCC->aInFlight); i++)
+    {
+        if (pThisCC->aInFlight[i].pUrb)
         {
             cLeft--;
-            pUrb = pThis->aInFlight[i].pUrb;
-            if (pThis->aInFlight[i].fInactive
+            pUrb = pThisCC->aInFlight[i].pUrb;
+            if (   pThisCC->aInFlight[i].fInactive
                 && pUrb->enmState == VUSBURBSTATE_IN_FLIGHT
                 && pUrb->enmType != VUSBXFERTYPE_CTRL)
@@ -4187 +4196 @@
      */
     if (fValidHCCA)
-        ohciR3UpdateHCCA(pDevIns, pThis);
+        ohciR3UpdateHCCA(pDevIns, pThis, pThisCC);
 # endif
 
@@ -4300 +4309 @@
 
         /* Clean up any URBs that have been removed. */
-        ohciR3CancelOrphanedURBs(pDevIns, pThis);
+        ohciR3CancelOrphanedURBs(pDevIns, pThis, pThisCC);
 
         /* Start the next frame. */