Changeset 87767 in vbox for trunk/src/VBox/ExtPacks/BusMouseSample/DevBusMouse.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/ExtPacks/BusMouseSample/DevBusMouse.cpp (modified) (2 diffs)

trunk/src/VBox/ExtPacks/BusMouseSample/DevBusMouse.cpp

@@ -237 +237 @@
  * @callback_method_impl{FNTMTIMERDEV}
  */
-static DECLCALLBACK(void) bmsR3TimerCallback(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
+static DECLCALLBACK(void) bmsR3TimerCallback(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, void *pvUser)
 {
     PBMSSTATE   pThis   = PDMDEVINS_2_DATA(pDevIns, PBMSSTATE);
     PBMSSTATER3 pThisCC = PDMDEVINS_2_DATA(pDevIns, PBMSSTATER3);
     uint8_t     irq_bit;
-    RT_NOREF(pvUser, pTimer);
+    RT_NOREF(pvUser, hTimer);
+    Assert(hTimer == pThis->hMouseTimer);
 
     /* Toggle the IRQ line if interrupts are enabled. */
@@ -283 +284 @@
 
     /* Re-arm the timer. */
-    PDMDevHlpTimerSetMillies(pDevIns, pThis->hMouseTimer, pThis->cTimerPeriodMs);
+    PDMDevHlpTimerSetMillies(pDevIns, hTimer, pThis->cTimerPeriodMs);
 }