Changeset 82060 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 20, 2019 10:06:28 PM (5 years ago)

Author:

vboxsync

Message:

DevVGA: TMTimer -> PDMDevHlpTimer. bugref:9218

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (7 diffs)
• DevVGA.h (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -4839 +4839 @@
 static DECLCALLBACK(int) vgaPortSetRefreshRate(PPDMIDISPLAYPORT pInterface, uint32_t cMilliesInterval)
 {
-    PVGASTATE pThis = IDISPLAYPORT_2_VGASTATE(pInterface);
+    PVGASTATE  pThis   = IDISPLAYPORT_2_VGASTATE(pInterface);
+    PPDMDEVINS pDevIns = pThis->pDevInsR3;
 
     /*
@@ -4853 +4854 @@
 
     if (cMilliesInterval)
-        return TMTimerSetMillies(pThis->RefreshTimer, cMilliesInterval);
-    return TMTimerStop(pThis->RefreshTimer);
+        return PDMDevHlpTimerSetMillies(pDevIns, pThis->hRefreshTimer, cMilliesInterval);
+    return PDMDevHlpTimerStop(pDevIns, pThis->hRefreshTimer);
 }
 
@@ -5430 +5431 @@
 }
 
+/**
+ * @callback_method_impl{FNTMTIMERFNTMTIMERDEV, VGA Refresh Timer}
+ */
 static DECLCALLBACK(void) vgaTimerRefresh(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
     PVGASTATE pThis = (PVGASTATE)pvUser;
-    NOREF(pDevIns);
+    RT_NOREF(pTimer);
 
     if (pThis->fScanLineCfg & VBVASCANLINECFG_ENABLE_VSYNC_IRQ)
-    {
         VBVARaiseIrq(pThis, HGSMIHOSTFLAGS_VSYNC);
-    }
 
     if (pThis->pDrv)
@@ -5444 +5446 @@
 
     if (pThis->cMilliesRefreshInterval)
-        TMTimerSetMillies(pTimer, pThis->cMilliesRefreshInterval);
+        PDMDevHlpTimerSetMillies(pDevIns, pThis->hRefreshTimer, pThis->cMilliesRefreshInterval);
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -5764 +5766 @@
 
 /**
- * @copydoc FNSSMDEVLOADEXEC
+ * @callback_method_impl{FNSSMDEVLOADEXEC}
  */
 static DECLCALLBACK(int) vgaR3LoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
@@ -5854 +5856 @@
 
 /**
- * @copydoc FNSSMDEVLOADDONE
+ * @@callback_method_impl{FNSSMDEVLOADDONE}
  */
 static DECLCALLBACK(int) vgaR3LoadDone(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
@@ -6819 +6821 @@
      * Create the refresh timer.
      */
-    rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_REAL, vgaTimerRefresh,
-                                pThis, TMTIMER_FLAGS_NO_CRIT_SECT,
-                                "VGA Refresh Timer", &pThis->RefreshTimer);
+    rc = PDMDevHlpTimerCreate(pDevIns, TMCLOCK_REAL, vgaTimerRefresh, pThis, TMTIMER_FLAGS_NO_CRIT_SECT,
+                              "VGA Refresh Timer", &pThis->hRefreshTimer);
     if (RT_FAILURE(rc))
         return rc;

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -316 +316 @@
 
     /** Refresh timer handle - HC. */
-    PTMTIMERR3                  RefreshTimer;
+    TMTIMERHANDLE               hRefreshTimer;
 
     /** Pointer to the device instance - R0 Ptr. */