Changeset 82325 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Dec 2, 2019 2:57:29 PM (5 years ago)

Author:

vboxsync

Message:

DevIchAc97: ichac97TimerSet isn't used from ring-0, so make it ring-3 only (would've been obvious if declared 'static' earlier as it should've been). bugref:9218

File:

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

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

@@ -651 +651 @@
 static void               ichac97R3BDLEDumpAll(PAC97STATE pThis, uint64_t u64BDLBase, uint16_t cBDLE);
 # endif
+static bool               ichac97R3TimerSet(PPDMDEVINS pDevIns, PAC97STATE pThis, PAC97STREAM pStream, uint64_t tsExpire, bool fForce);
 #endif /* IN_RING3 */
-static bool               ichac97TimerSet(PPDMDEVINS pDevIns, PAC97STATE pThis, PAC97STREAM pStream, uint64_t tsExpire, bool fForce);
 
 static void ichac97WarmReset(PAC97STATE pThis)
@@ -2607 +2607 @@
         ichac97R3StreamTransferUpdate(pDevIns, pThis, pStream, pStream->Regs.picb << 1); /** @todo r=andy Assumes 16-bit samples. */
 
-        ichac97TimerSet(pDevIns, pThis, pStream,
+        ichac97R3TimerSet(pDevIns, pThis, pStream,
                           PDMDevHlpTimerGet(pDevIns, RT_SAFE_SUBSCRIPT8(pThis->ahTimers, pStream->u8SD))
                         + pStream->State.cTransferTicks,
@@ -2616 +2616 @@
 }
 
-#endif /* IN_RING3 */
 
 /**
@@ -2637 +2636 @@
  *          Forcing a new expiration time will override the above mechanism.
  */
-static bool ichac97TimerSet(PPDMDEVINS pDevIns, PAC97STATE pThis, PAC97STREAM pStream, uint64_t tsExpire, bool fForce)
+static bool ichac97R3TimerSet(PPDMDEVINS pDevIns, PAC97STATE pThis, PAC97STREAM pStream, uint64_t tsExpire, bool fForce)
 {
     AssertPtrReturn(pThis, false);
@@ -2661 +2660 @@
 }
 
-#ifdef IN_RING3
 
 /**
@@ -3149 +3147 @@
                             /* Arm the timer for this stream. */
                             /** @todo r=bird: This function returns bool, not VBox status! */
-                            int rc2 = ichac97TimerSet(pDevIns, pThis, pStream,
+                            int rc2 = ichac97R3TimerSet(pDevIns, pThis, pStream,
                                                         PDMDevHlpTimerGet(pDevIns, RT_SAFE_SUBSCRIPT8(pThis->ahTimers,
                                                                                                       pStream->u8SD))
@@ -3647 +3645 @@
             /* Re-arm the timer for this stream. */
             /** @todo r=bird: This function returns bool, not VBox status! */
-            rc2 = ichac97TimerSet(pDevIns, pThis, pStream,
+            rc2 = ichac97R3TimerSet(pDevIns, pThis, pStream,
                                     PDMDevHlpTimerGet(pDevIns, RT_SAFE_SUBSCRIPT8(pThis->ahTimers, pStream->u8SD))
                                   + pStream->State.cTransferTicks,