Changeset 70246 in vbox for trunk/src

Timestamp:

Dec 20, 2017 6:01:54 PM (7 years ago)

Author:

vboxsync

Message:

Audio/HDA: Use a dedicated fRunning flag for a stream, as the RUN bit of SDnCTL does not necessarily reflect the current (internal) state.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (2 diffs)
• DevHDACommon.cpp (modified) (1 diff)
• HDAStream.cpp (modified) (4 diffs)
• HDAStream.h (modified) (2 diffs)

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

@@ -1482 +1482 @@
     /* Some guests tend to write SDnSTS even if the stream is not running.
      * So make sure to check if the RUN bit is set first. */
-    const bool fInRun = RT_BOOL(HDA_STREAM_REG(pThis, CTL, pStream->u8SD) & HDA_SDCTL_RUN);
-
-    Log3Func(("[SD%RU8] fRun=%RTbool %R[sdsts]\n", pStream->u8SD, fInRun, v));
+    const bool fRunning = pStream->State.fRunning;
+
+    Log3Func(("[SD%RU8] fRunning=%RTbool %R[sdsts]\n", pStream->u8SD, fRunning, v));
 
     PHDASTREAMPERIOD pPeriod = &pStream->State.Period;
@@ -1504 +1504 @@
             hdaStreamPeriodEnd(pPeriod);
 
-            if (fInRun)
+            if (fRunning)
                 hdaStreamPeriodBegin(pPeriod, hdaWalClkGetCurrent(pThis) /* Use current wall clock time */);
         }

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

@@ -659 +659 @@
             PHDASTREAM pStream = &pThis->aStreams[i];
 
-            if (!(HDA_STREAM_REG(pThis, CTL, pStream->u8SD) & HDA_SDCTL_RUN))
+            if (!pStream->State.fRunning)
                 continue;
 

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

@@ -55 +55 @@
 
     pStream->State.fInReset = false;
+    pStream->State.fRunning = false;
 #ifdef HDA_USE_DMA_ACCESS_HANDLER
     RTListInit(&pStream->State.lstDMAHandlers);
@@ -354 +355 @@
 
 # ifdef VBOX_STRICT
-    AssertReleaseMsg(!RT_BOOL(HDA_STREAM_REG(pThis, CTL, uSD) & HDA_SDCTL_RUN),
-                     ("[SD%RU8] Cannot reset stream while in running state\n", uSD));
+    AssertReleaseMsg(!pStream->State.fRunning, ("[SD%RU8] Cannot reset stream while in running state\n", uSD));
 # endif
 
@@ -475 +475 @@
     }
 
+    if (RT_SUCCESS(rc))
+    {
+        pStream->State.fRunning = fEnable;
+    }
+
     LogFunc(("[SD%RU8] rc=%Rrc\n", pStream->u8SD, rc));
     return rc;
@@ -741 +746 @@
 
     /* Stream not running? */
-    if (!(HDA_STREAM_REG(pThis, CTL, pStream->u8SD) & HDA_SDCTL_RUN))
-    {
-        Log3Func(("[SD%RU8] RUN bit not set\n", pStream->u8SD));
+    if (!pStream->State.fRunning)
+    {
+        Log3Func(("[SD%RU8] Not running\n", pStream->u8SD));
         fProceed = false;
     }

trunk/src/VBox/Devices/Audio/HDAStream.h

@@ -118 +118 @@
      *  in reset mode and therefore not acccessible by the guest. */
     volatile bool           fInReset;
+        /** Flag indicating if the stream is in running state or not. */
+        volatile bool                   fRunning;
     /** Unused, padding. */
-    uint32_t                Padding0;
+    uint8_t                 Padding0[3];
     /** Critical section to serialize access. */
     RTCRITSECT              CritSect;
@@ -191 +193 @@
     /** Stream descriptor number (SDn). */
     uint8_t                  u8SD;
-    uint8_t                  Padding0[7];
+        /** Current channel index.
+         *  For a stereo stream, this is u8Channel + 1. */
+    uint8_t                  u8Channel;
     /** DMA base address (SDnBDPU - SDnBDPL). */
     uint64_t                 u64BDLBase;