Changeset 82200 in vbox

Timestamp:

Nov 25, 2019 8:55:43 PM (5 years ago)

Author:

vboxsync

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

135014

Message:

DevPS2: Critsect. bugref:9218

Location:

trunk/src/VBox/Devices/Input

Files:

• DevPS2.h (modified) (2 diffs)
• DevPS2K.cpp (modified) (6 diffs)
• DevPS2M.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Input/DevPS2.h

@@ -136 +136 @@
     TMTIMERHANDLE       hThrottleTimer;
 
-    /** The device critical section protecting everything - R3 Ptr */
-    R3PTRTYPE(PPDMCRITSECT) pCritSectR3;
     /** The device instance.
      * @note Only for getting our bearings in interface methods. */
@@ -275 +273 @@
     uint32_t            uThrottleDelay;
 
-    /** The device critical section protecting everything - R3 Ptr */
-    R3PTRTYPE(PPDMCRITSECT) pCritSectR3;
     /** The device instance.
      * @note Only for getting our bearings in interface methods. */

trunk/src/VBox/Devices/Input/DevPS2K.cpp

@@ -942 +942 @@
 
     /* Grab the lock to avoid races with event delivery or EMTs. */
-    int rc = PDMCritSectEnter(pThis->pCritSectR3, VERR_SEM_BUSY);
+    int rc = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_SEM_BUSY);
     AssertReleaseRC(rc);
 
@@ -954 +954 @@
         KBCUpdateInterrupts(pDevIns);
 
-    PDMCritSectLeave(pThis->pCritSectR3);
+    PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3);
 }
 
@@ -1116 +1116 @@
     if (fHaveEvent)
     {
-        rc = PDMCritSectEnter(pThis->pCritSectR3, VERR_SEM_BUSY);
-        AssertReleaseRC(rc);
-
+        Assert(PDMDevHlpCritSectIsOwner(pDevIns, pDevIns->pCritSectRoR3));
         rc = ps2kR3ProcessKeyEvent(pDevIns, pThis, u32HidCode, fKeyDown);
-
-        PDMCritSectLeave(pThis->pCritSectR3);
     }
 
@@ -1139 +1135 @@
     LogRelFlowFunc(("key code %08X\n", u32UsageCode));
 
-    rc = PDMCritSectEnter(pThis->pCritSectR3, VERR_SEM_BUSY);
+    rc = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_SEM_BUSY);
     AssertReleaseRC(rc);
 
@@ -1150 +1146 @@
         ps2kR3ReleaseKeys(pDevIns, pThis);
 
-    PDMCritSectLeave(pThis->pCritSectR3);
+    PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3);
 
     return VINF_SUCCESS;
 }
 
+
+/* -=-=-=-=-=- Device management -=-=-=-=-=- */
 
 /**
@@ -1372 +1370 @@
 
     /*
-     * Initialize the critical section pointer(s).
-     */
-    pThis->pCritSectR3 = pDevIns->pCritSectRoR3;
-
-    /*
      * Create the input rate throttling timer.
      */

trunk/src/VBox/Devices/Input/DevPS2M.cpp

@@ -683 +683 @@
 
     /* Grab the lock to avoid races with PutEvent(). */
-    int rc = PDMCritSectEnter(pThis->pCritSectR3, VERR_SEM_BUSY);
+    int rc = PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_SEM_BUSY);
     AssertReleaseRC(rc);
 
@@ -700 +700 @@
         pThis->fThrottleActive = false;
 
-    PDMCritSectLeave(pThis->pCritSectR3);
+    PDMDevHlpCritSectLeave(pDevIns, pDevIns->pCritSectRoR3);
 }
 
@@ -758 +758 @@
 }
 
+
 /* -=-=-=-=-=- Mouse: IBase  -=-=-=-=-=- */
 
@@ -824 +825 @@
 }
 
+
 /* -=-=-=-=-=- Mouse: IMousePort  -=-=-=-=-=- */
 
@@ -866 +868 @@
 
 
+/* -=-=-=-=-=- Device management -=-=-=-=-=- */
 
 /**
@@ -1025 +1028 @@
     pThis->Mouse.IPort.pfnPutEventAbs        = ps2mR3MousePort_PutEventAbs;
     pThis->Mouse.IPort.pfnPutEventMultiTouch = ps2mR3MousePort_PutEventMT;
-
-    /*
-     * Initialize the critical section pointer(s).
-     */
-    pThis->pCritSectR3 = pDevIns->pCritSectRoR3;
 
     /*