Changeset 90331 in vbox

Timestamp:

Jul 26, 2021 12:53:55 PM (4 years ago)

Author:

vboxsync

Message:

DevHda: Use PDMCritSect API via PDMDevHlp. bugref:10074

File:

• trunk/src/VBox/Devices/Audio/DevHda.cpp (modified) (8 diffs)

trunk/src/VBox/Devices/Audio/DevHda.cpp

@@ -1605 +1605 @@
 
         STAM_REL_PROFILE_START_NS(&pStreamR3->State.StatReset, a);
-        Assert(PDMCritSectIsOwner(&pThis->CritSect));
+        Assert(PDMDevHlpCritSectIsOwner(pDevIns, &pThis->CritSect));
         PAUDMIXSINK const pMixSink = pStreamR3->pMixSink ? pStreamR3->pMixSink->pMixSink : NULL;
         if (pMixSink)
@@ -1635 +1635 @@
             LogFunc(("[SD%RU8] State changed (fRun=%RTbool)\n", uSD, fRun));
 
-            Assert(PDMCritSectIsOwner(&pThis->CritSect));
+            Assert(PDMDevHlpCritSectIsOwner(pDevIns, &pThis->CritSect));
             /** @todo bird: It's not clear to me when the pMixSink is actually
              *        assigned to the stream, so being paranoid till I find out... */
@@ -2776 +2776 @@
 {
     PHDASTATER3 pThisCC = RT_FROM_MEMBER(pCodec, HDASTATER3, Codec);
-    PHDASTATE   pThis   = PDMDEVINS_2_DATA(pThisCC->pDevIns, PHDASTATE);
+    PPDMDEVINS  pDevIns = pThisCC->pDevIns;
+    PHDASTATE   pThis   = PDMDEVINS_2_DATA(pDevIns, PHDASTATE);
     LogFunc(("enmMixerCtl=%s, uSD=%RU8, uChannel=%RU8\n", PDMAudioMixerCtlGetName(enmMixerCtl), uSD, uChannel));
 
@@ -2826 +2827 @@
             LogFunc(("Sink '%s' was assigned to stream #%RU8 (channel %RU8) before\n",
                      pSink->pMixSink->pszName, pOldStreamShared->u8SD, pOldStreamShared->u8Channel));
-            Assert(PDMCritSectIsOwner(&pThis->CritSect));
+            Assert(PDMDevHlpCritSectIsOwner(pDevIns, &pThis->CritSect));
 
             /* Only disable the stream if the stream descriptor # has changed. */
@@ -2854 +2855 @@
             PHDASTREAMR3 pStreamR3     = &pThisCC->aStreams[uSD];
             PHDASTREAM   pStreamShared = &pThis->aStreams[uSD];
-            Assert(PDMCritSectIsOwner(&pThis->CritSect));
+            Assert(PDMDevHlpCritSectIsOwner(pDevIns, &pThis->CritSect));
 
             pSink->pStreamR3     = pStreamR3;
@@ -2938 +2939 @@
 {
     LogFlowFuncEnter();
-    Assert(PDMCritSectIsOwner(&pThis->CritSect));
+    Assert(PDMDevHlpCritSectIsOwner(pDevIns, &pThis->CritSect));
 
     /*
@@ -4751 +4752 @@
     PHDASTATER3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PHDASTATER3);
 
-    if (PDMCritSectIsInitialized(&pThis->CritSect))
-        PDMCritSectEnter(&pThis->CritSect, VERR_IGNORED);
+    if (PDMDevHlpCritSectIsInitialized(pDevIns, &pThis->CritSect))
+        PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
 
     PHDADRIVER pDrv;
@@ -4775 +4776 @@
     }
 
-    if (PDMCritSectIsInitialized(&pThis->CritSect))
-    {
-        PDMCritSectLeave(&pThis->CritSect);
-        PDMR3CritSectDelete(&pThis->CritSect);
+    if (PDMDevHlpCritSectIsInitialized(pDevIns, &pThis->CritSect))
+    {
+        PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
+        PDMDevHlpCritSectDelete(pDevIns, &pThis->CritSect);
     }
     return VINF_SUCCESS;