Changeset 87905 in vbox

Timestamp:

Mar 1, 2021 9:14:13 PM (4 years ago)

Author:

vboxsync

Message:

Audio/HDA: Follow-up fixes for r142934. ticketoem2ref:36

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (1 diff)
• HDAStream.cpp (modified) (6 diffs)

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

@@ -2677 +2677 @@
                   uSD, fSinkActive, fTimerScheduled, tsTransferNext, tsTransferNext - tsNow));
 
-        /* Note: tsTransferNext can be 0, which means we have to run *now*. */
         hdaR3TimerSet(pDevIns, pStreamShared, tsTransferNext,
                       true /*fForce*/, tsNow);

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

@@ -1092 +1092 @@
  * @param   pStreamR3           HDA stream to update (ring-3).
  * @param   cbToProcessMax      How much data (in bytes) to process as maximum.
- * @param   fInTimer            Set if we're in the timer callout.
  */
 static int hdaR3StreamTransfer(PPDMDEVINS pDevIns, PHDASTATE pThis, PHDASTATER3 pThisCC, PHDASTREAM pStreamShared,
-                               PHDASTREAMR3 pStreamR3, uint32_t cbToProcessMax, bool fInTimer)
+                               PHDASTREAMR3 pStreamR3, uint32_t cbToProcessMax)
 {
     LogFlowFuncEnter();
@@ -1534 +1533 @@
 
     const bool fTransferComplete  = cbLeft == 0;
-    uint64_t   tsTransferNext     = 0;
-
     if (fTransferComplete)
     {
@@ -1562 +1559 @@
     /* Set the next transfer timing slot.
      * This must happen at a constant rate. */
-     tsTransferNext = tsNow + pStreamShared->State.cTransferTicks;
-
-    /* If we need to do another transfer, (re-)arm the device timer.  */
-    if (tsTransferNext) /* Can be 0 if no next transfer is needed. */
-    {
-        Log3Func(("[SD%RU8] Scheduling timer @ %RU64 (in %RU64 ticks)\n", uSD, tsTransferNext, tsTransferNext - tsNow));
-
-        /* Make sure to assign next transfer timestamp before setting the timer. */
-        Assert(tsTransferNext > tsNow);
-        pStreamShared->State.tsTransferNext = tsTransferNext;
-
-        Assert(!fInTimer || tsNow == PDMDevHlpTimerGet(pDevIns, pStreamShared->hTimer));
-        hdaR3TimerSet(pDevIns, pStreamShared, tsTransferNext,
-                      true /* fForce - skip tsTransferNext check */, fInTimer ? tsNow : 0);
-    }
+    pStreamShared->State.tsTransferNext = tsNow + pStreamShared->State.cTransferTicks;
 
     /* Always update this timestamp, no matter what pStreamShared->State.tsTransferNext is. */
@@ -1586 +1569 @@
               uSD, fTransferComplete, pStreamShared->State.cTransferPendingInterrupts));
     Log3Func(("[SD%RU8] tsNow=%RU64, tsTransferNext=%RU64 (in %RU64 ticks)\n",
-              uSD, tsNow, tsTransferNext, tsTransferNext ? tsTransferNext - tsNow : 0));
+              uSD, tsNow, pStreamShared->State.tsTransferNext,
+              pStreamShared->State.tsTransferNext ? pStreamShared->State.tsTransferNext - tsNow : 0));
 
     LogFlowFuncLeave();
@@ -1659 +1643 @@
 
             /* Do the DMA transfer. */
-            rc2 = hdaR3StreamTransfer(pDevIns, pThis, pThisCC, pStreamShared, pStreamR3, cbStreamFree, fInTimer);
+            rc2 = hdaR3StreamTransfer(pDevIns, pThis, pThisCC, pStreamShared, pStreamR3, cbStreamFree);
             AssertRC(rc2);
 
@@ -1787 +1771 @@
             if (cbStreamUsed)
             {
-                rc2 = hdaR3StreamTransfer(pDevIns, pThis, pThisCC, pStreamShared, pStreamR3, cbStreamUsed, fInTimer);
+                rc2 = hdaR3StreamTransfer(pDevIns, pThis, pThisCC, pStreamShared, pStreamR3, cbStreamUsed);
                 AssertRC(rc2);
             }