Changeset 87767 in vbox for trunk/src/VBox/Devices/Audio/DevSB16.cpp

Timestamp:

Feb 16, 2021 4:41:18 PM (4 years ago)

Author:

vboxsync

Message:

VMM/TM,Devices/*: Changed the device and usb timer callbacks to take a timer handle rather than a pointer. Try a little harder using it. bugref:9943

File:

• trunk/src/VBox/Devices/Audio/DevSB16.cpp (modified) (3 diffs)

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

@@ -300 +300 @@
  * @callback_method_impl{PFNTMTIMERDEV}
  */
-static DECLCALLBACK(void) sb16TimerIRQ(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
+static DECLCALLBACK(void) sb16TimerIRQ(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, void *pvUser)
 {
     PSB16STATE pThis = PDMDEVINS_2_DATA(pDevIns, PSB16STATE);
-    RT_NOREF(pvUser, pTimer);
+    RT_NOREF(pvUser, hTimer);
 
     pThis->can_write = 1;
@@ -1689 +1689 @@
  * @callback_method_impl{FNTMTIMERDEV}
  */
-static DECLCALLBACK(void) sb16TimerIO(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
+static DECLCALLBACK(void) sb16TimerIO(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, void *pvUser)
 {
     PSB16STATE pThis = PDMDEVINS_2_DATA(pDevIns, PSB16STATE);
-    RT_NOREF(pTimer, pvUser);
-
-    uint64_t cTicksNow     = PDMDevHlpTimerGet(pDevIns, pThis->hTimerIO);
+    Assert(hTimer == pThis->hTimerIO); RT_NOREF(pvUser);
+
+    uint64_t cTicksNow     = PDMDevHlpTimerGet(pDevIns, hTimer);
     bool     fIsPlaying    = false; /* Whether one or more streams are still playing. */
     bool     fDoTransfer   = false;
@@ -1749 +1749 @@
         uint64_t cTicks = pThis->cTicksTimerIOInterval;
         /** @todo adjust cTicks down by now much cbOutMin represents. */
-        PDMDevHlpTimerSet(pDevIns, pThis->hTimerIO, cTicksNow + cTicks);
+        PDMDevHlpTimerSet(pDevIns, hTimer, cTicksNow + cTicks);
     }
 }