Changeset 37469 in vbox

Timestamp:

Jun 15, 2011 2:29:25 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

72285

Message:

USB/Dev*: Locking fixes.

File:

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

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

@@ -873 +873 @@
 
     memset(pAvailable, 0, sizeof(*pAvailable));
+
+    PDMCritSectEnter(pOhci->pDevInsR3->pCritSectRoR3, VERR_IGNORED);
     for (iPort = 0; iPort < RT_ELEMENTS(pOhci->RootHub.aPorts); iPort++)
     {
@@ -881 +883 @@
         }
     }
+    PDMCritSectLeave(pOhci->pDevInsR3->pCritSectRoR3);
 
     return cPorts;
@@ -909 +912 @@
     POHCI pOhci = VUSBIROOTHUBPORT_2_OHCI(pInterface);
     LogFlow(("ohciRhAttach: pDev=%p uPort=%u\n", pDev, uPort));
+    PDMCritSectEnter(pOhci->pDevInsR3->pCritSectRoR3, VERR_IGNORED);
 
     /*
@@ -927 +931 @@
     ohciSetInterrupt(pOhci, OHCI_INTR_ROOT_HUB_STATUS_CHANGE);
 
+    PDMCritSectLeave(pOhci->pDevInsR3->pCritSectRoR3);
     return VINF_SUCCESS;
 }
@@ -942 +947 @@
     POHCI pOhci = VUSBIROOTHUBPORT_2_OHCI(pInterface);
     LogFlow(("ohciRhDetach: pDev=%p uPort=%u\n", pDev, uPort));
+    PDMCritSectEnter(pOhci->pDevInsR3->pCritSectRoR3, VERR_IGNORED);
 
     /*
@@ -961 +967 @@
     ohci_remote_wakeup(pOhci);
     ohciSetInterrupt(pOhci, OHCI_INTR_ROOT_HUB_STATUS_CHANGE);
+
+    PDMCritSectLeave(pOhci->pDevInsR3->pCritSectRoR3);
 }
 
@@ -998 +1006 @@
 {
     POHCI pOhci = VUSBIROOTHUBPORT_2_OHCI(pInterface);
+    PDMCritSectEnter(pOhci->pDevInsR3->pCritSectRoR3, VERR_IGNORED);
 
     pOhci->RootHub.status = 0;
@@ -1030 +1039 @@
     }
 
+    PDMCritSectLeave(pOhci->pDevInsR3->pCritSectRoR3);
     return VINF_SUCCESS;
 }
@@ -2402 +2412 @@
     LogFlow(("%s: ohciRhXferCompletion: EdAddr=%#010RX32 cTds=%d TdAddr0=%#010RX32\n",
              pUrb->pszDesc, pUrb->Hci.EdAddr, pUrb->Hci.cTds, pUrb->Hci.paTds[0].TdAddr));
+    Assert(PDMCritSectIsOwner(pOhci->pDevInsR3->pCritSectRoR3));
 
     pOhci->fIdle = false;   /* Mark as active */
@@ -2476 +2487 @@
 {
     POHCI pOhci = VUSBIROOTHUBPORT_2_OHCI(pInterface);
+    Assert(PDMCritSectIsOwner(pOhci->pDevInsR3->pCritSectRoR3));
 
     /*