Changeset 59186 in vbox

Timestamp:

Dec 18, 2015 2:11:44 PM (9 years ago)

Author:

vboxsync

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

104804

Message:

DevIchAc97.cpp: Use the time at the start of the ac97Timer callback when rescheduling it. Use the TMTimerGet* functions instead of the PDMDevHlp variants. Some documentation amendments. Use newly introduced RTLISTNODER3 to avoid padding unions in cross context code.

File:

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

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

@@ -304 +304 @@
 typedef struct AC97DRIVER
 {
-    union
-    {
-        /** Node for storing this driver in our device driver
-         *  list of AC97STATE. */
-        RTLISTNODE                     Node;
-        struct
-        {
-            R3PTRTYPE(void *)          dummy1;
-            R3PTRTYPE(void *)          dummy2;
-        } dummy;
-    };
-
+    /** Node for storing this driver in our device driver list of AC97STATE. */
+    RTLISTNODER3                       Node;
     /** Pointer to AC97 controller (state). */
     R3PTRTYPE(PAC97STATE)              pAC97State;
@@ -356 +346 @@
     AC97STREAM              StrmStOut;
 #ifndef VBOX_WITH_AUDIO_CALLBACKS
-    /** The emulation timer for handling the attached
-     *  LUN drivers. */
+    /** The timer for pumping data thru the attached LUN drivers. */
     PTMTIMERR3              pTimer;
-    /** Timer ticks for handling the LUN drivers. */
-    uint64_t                uTimerTicks;
-    /** Timestamp (delta) since last timer call. */
+    /** The timer interval for pumping data thru the LUN drivers in timer ticks. */
+    uint64_t                cTimerTicks;
+    /** Timestamp of the last timer callback (ac97Timer).
+     * Used to calculate the time actually elapsed between two timer callbacks. */
     uint64_t                uTimerTS;
 #endif
@@ -369 +359 @@
     STAMCOUNTER             StatBytesWritten;
 #endif
-    /** List of associated LUN drivers. */
+    /** List of associated LUN drivers (AC97DRIVER). */
     RTLISTANCHOR            lstDrv;
     /** The device' software mixer. */
@@ -1177 +1167 @@
 static DECLCALLBACK(void) ichac97Timer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
-    PAC97STATE pThis = PDMINS_2_DATA(pDevIns, PAC97STATE);
-    AssertPtrReturnVoid(pThis);
+    PAC97STATE pThis = (PAC97STATE)pvUser;
+    Assert(pThis == PDMINS_2_DATA(pDevIns, PAC97STATE));
+    AssertPtr(pThis);
 
     STAM_PROFILE_START(&pThis->StatTimer, a);
@@ -1191 +1182 @@
     uint32_t cbIn, cbOut;
 
-    uint64_t uTicksNow     = PDMDevHlpTMTimeVirtGet(pDevIns);
-    uint64_t uTicksElapsed = uTicksNow  - pThis->uTimerTS;
-    uint64_t uTicksPerSec  = PDMDevHlpTMTimeVirtGetFreq(pDevIns);
-
-    pThis->uTimerTS = uTicksNow;
+    uint64_t cTicksNow     = TMTimerGet(pTimer);
+    uint64_t cTicksElapsed = cTicksNow  - pThis->uTimerTS;
+    uint64_t cTicksPerSec  = TMTimerGetFreq(pTimer);
+
+    pThis->uTimerTS = cTicksNow;
 
     RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
     {
-        cbIn = cbOut = 0;
+        uint32_t cbIn = 0;
+        uint32_t cbOut = 0;
+
         rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
                                               &cbIn, &cbOut, NULL /* cSamplesLive */);
@@ -1219 +1212 @@
             || !fIsActiveOut)
         {
-            uint32_t cSamplesMin  = (int)((2 * uTicksElapsed * pDrv->Out.pStrmOut->Props.uHz + uTicksPerSec) / uTicksPerSec / 2);
+            uint32_t cSamplesMin  = (int)((2 * cTicksElapsed * pDrv->Out.pStrmOut->Props.uHz + cTicksPerSec) / cTicksPerSec / 2);
             uint32_t cbSamplesMin = AUDIOMIXBUF_S2B(&pDrv->Out.pStrmOut->MixBuf, cSamplesMin);
 
@@ -1254 +1247 @@
         ichac97TransferAudio(pThis, PI_INDEX, cbInMax); /** @todo Add rc! */
 
-    TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTimerTicks);
+    /* Kick the timer again. */
+    uint64_t cTicks = pThis->cTimerTicks;
+    /** @todo adjust cTicks down by now much cbOutMin represents. */
+    TMTimerSet(pThis->pTimer, cTicksNow + cTicks);
 
     STAM_PROFILE_STOP(&pThis->StatTimer, a);
@@ -2485 +2481 @@
         if (RT_SUCCESS(rc))
         {
-            pThis->uTimerTicks = PDMDevHlpTMTimeVirtGetFreq(pDevIns) / 200; /** Hz. @todo Make this configurable! */
-            pThis->uTimerTS    = PDMDevHlpTMTimeVirtGet(pDevIns);
-            if (pThis->uTimerTicks < 100)
-                pThis->uTimerTicks = 100;
-            LogFunc(("Timer ticks=%RU64\n", pThis->uTimerTicks));
+            pThis->cTimerTicks = TMTimerGetFreq(pThis->pTimer) / 200; /** @todo Make this configurable! */
+            pThis->uTimerTS    = TMTimerGet(pThis->pTimer);
+            LogFunc(("Timer ticks=%RU64\n", pThis->cTimerTicks));
 
             /* Fire off timer. */
-            TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->uTimerTicks);
+            TMTimerSet(pThis->pTimer, TMTimerGet(pThis->pTimer) + pThis->cTimerTicks);
         }
     }