Changeset 82331 in vbox for trunk/src/VBox/Devices/Audio/DevHDACommon.cpp

Timestamp:

Dec 2, 2019 11:50:22 PM (5 years ago)

Author:

vboxsync

Message:

DevHDA: Converted timers to new style. Left some todos. bugref:9218

File:

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

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

@@ -2 +2 @@
 /** @file
  * DevHDACommon.cpp - Shared HDA device functions.
+ *
+ * @todo r=bird: Shared with whom exactly?
  */
 
@@ -662 +664 @@
  *
  * @returns Whether the new expiration time was set or not.
- * @param   pThis               HDA state.
- * @param   pStream             HDA stream to set timer for.
- * @param   tsExpire            New (virtual) expiration time to set.
- * @param   fForce              Whether to force setting the expiration time or not.
+ * @param   pDevIns     The device instance.
+ * @param   pThis       HDA state.
+ * @param   pStream     HDA stream to set timer for.
+ * @param   tsExpire    New (virtual) expiration time to set.
+ * @param   fForce      Whether to force setting the expiration time or not.
  *
  * @remark  This function takes all active HDA streams and their
@@ -676 +679 @@
  *          Forcing a new expiration time will override the above mechanism.
  */
-bool hdaR3TimerSet(PHDASTATE pThis, PHDASTREAM pStream, uint64_t tsExpire, bool fForce)
-{
-    AssertPtrReturn(pThis, false);
-    AssertPtrReturn(pStream, false);
+bool hdaR3TimerSet(PPDMDEVINS pDevIns, PHDASTATE pThis, PHDASTREAM pStream, uint64_t tsExpire, bool fForce)
+{
+    AssertPtr(pThis);
+    AssertPtr(pStream);
 
     uint64_t tsExpireMin = tsExpire;
@@ -685 +688 @@
     if (!fForce)
     {
-        if (hdaR3StreamTransferIsScheduled(pStream))
-            tsExpireMin = RT_MIN(tsExpireMin, hdaR3StreamTransferGetNext(pStream));
-    }
-
-    AssertPtr(pThis->pTimer[pStream->u8SD]);
-
-    const uint64_t tsNow = TMTimerGet(pThis->pTimer[pStream->u8SD]);
+        /** @todo r=bird: hdaR3StreamTransferIsScheduled() also does a
+         * PDMDevHlpTimerGet(), so, some callers does one, this does, and then we do
+         * right afterwards == very inefficient! */
+        if (hdaR3StreamTransferIsScheduled(pDevIns, pStream))
+        {
+            uint64_t const tsNext = hdaR3StreamTransferGetNext(pStream);
+            if (tsExpireMin > tsNext)
+                tsExpireMin = tsNext;
+        }
+    }
+
+    const uint64_t tsNow = PDMDevHlpTimerGet(pDevIns, pStream->hTimer);
 
     /*
@@ -700 +708 @@
         tsExpireMin = tsNow;
 
-    int rc = TMTimerSet(pThis->pTimer[pStream->u8SD], tsExpireMin);
-    AssertRC(rc);
-
-    return RT_SUCCESS(rc);
+    int rc = PDMDevHlpTimerSet(pDevIns, pStream->hTimer, tsExpireMin);
+    AssertRCReturn(rc, false);
+
+    return true;
 }