Changeset 64581 in vbox for trunk

Timestamp:

Nov 4, 2016 3:51:21 PM (8 years ago)

Author:

vboxsync

Message:

Audio/HDA: Simplified hdaTimerMaybeStart() and hdaTimerMabeStop().

File:

• trunk/src/VBox/Devices/Audio/DevHDA.cpp (modified) (5 diffs)

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

@@ -1837 +1837 @@
     if (!fActive)
     {
-        if (pThis->cStreamsActive) /* Disable can be called mupltiple times. */
-            pThis->cStreamsActive--;
-
 # ifndef VBOX_WITH_AUDIO_HDA_CALLBACKS
         hdaTimerMaybeStop(pThis);
@@ -1846 +1843 @@
     else
     {
-        pThis->cStreamsActive++;
 # ifndef VBOX_WITH_AUDIO_HDA_CALLBACKS
         hdaTimerMaybeStart(pThis);
@@ -4070 +4066 @@
 static void hdaTimerMaybeStart(PHDASTATE pThis)
 {
-    if (pThis->cStreamsActive == 0) /* Only start the timer if there at least is one active streams. */
-        return;
+    LogFlowFuncEnter();
 
     if (!pThis->pTimer)
         return;
 
+    pThis->cStreamsActive++;
+
+    /* Only start the timer at the first active stream. */
+    if (pThis->cStreamsActive == 1)
+    {
+        LogRel2(("HDA: Starting transfers\n"));
+
+        /* Set timer flag. */
+        ASMAtomicXchgBool(&pThis->fTimerActive, true);
+
+        /* Update current time timestamp. */
+        pThis->uTimerTS = TMTimerGet(pThis->pTimer);
+
+        /* Start transfers. */
+        hdaDoTransfers(pThis);
+    }
+}
+
+static void hdaTimerStop(PHDASTATE pThis)
+{
     LogFlowFuncEnter();
 
-    LogRel2(("HDA: Starting transfers\n"));
+    LogRel2(("HDA: Stopping transfers\n"));
 
     /* Set timer flag. */
-    ASMAtomicXchgBool(&pThis->fTimerActive, true);
-
-    /* Update current time timestamp. */
-    pThis->uTimerTS = TMTimerGet(pThis->pTimer);
-
-    /* Start transfers. */
-    hdaDoTransfers(pThis);
+    ASMAtomicXchgBool(&pThis->fTimerActive, false);
 }
 
 static void hdaTimerMaybeStop(PHDASTATE pThis)
 {
-    if (pThis->cStreamsActive) /* Some streams still active? Bail out. */
-        return;
+    LogFlowFuncEnter();
 
     if (!pThis->pTimer)
         return;
 
-    LogRel2(("HDA: Stopping transfers\n"));
-
-    /* Set timer flag. */
-    ASMAtomicXchgBool(&pThis->fTimerActive, false);
+    if (pThis->cStreamsActive) /* Disable can be called mupltiple times. */
+        pThis->cStreamsActive--;
+
+    if (pThis->cStreamsActive == 0)
+        hdaTimerStop(pThis);
 }
 
@@ -5524 +5533 @@
      * Stop the timer, if any.
      */
-    hdaTimerMaybeStop(pThis);
+    hdaTimerStop(pThis);
+
+    pThis->cStreamsActive = 0;
 # endif
 
@@ -5616 +5627 @@
     /* Emulation of codec "wake up" (HDA spec 5.5.1 and 6.5). */
     HDA_REG(pThis, STATESTS) = 0x1;
-
-# ifndef VBOX_WITH_AUDIO_HDA_CALLBACKS
-    hdaTimerMaybeStart(pThis);
-# endif
 
     LogFlowFuncLeave();