Changeset 26158 in vbox

Timestamp:

Feb 2, 2010 6:05:43 PM (15 years ago)

Author:

vboxsync

Message:

TMR3UTCNow -> TMR3UtcNow + DevHlp.

Location:

trunk

Files:

• include/VBox/pdmdev.h (modified) (2 diffs)
• include/VBox/tm.h (modified) (1 diff)
• src/VBox/Devices/PC/DevRTC.cpp (modified) (1 diff)
• src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (2 diffs)
• src/VBox/VMM/PDMDevHlp.cpp (modified) (3 diffs)
• src/VBox/VMM/TM.cpp (modified) (1 diff)

trunk/include/VBox/pdmdev.h

@@ -2304 +2304 @@
      * @param   pTime               Where to store the time.
      */
-    DECLR3CALLBACKMEMBER(PRTTIMESPEC, pfnUTCNow,(PPDMDEVINS pDevIns, PRTTIMESPEC pTime));
+    DECLR3CALLBACKMEMBER(PRTTIMESPEC, pfnTMUtcNow,(PPDMDEVINS pDevIns, PRTTIMESPEC pTime));
 
     /**
@@ -3774 +3774 @@
 
 /**
- * @copydoc PDMDEVHLPR3::pfnUTCNow
- */
-DECLINLINE(PRTTIMESPEC) PDMDevHlpUTCNow(PPDMDEVINS pDevIns, PRTTIMESPEC pTime)
-{
-    return pDevIns->pDevHlpR3->pfnUTCNow(pDevIns, pTime);
+ * @copydoc PDMDEVHLPR3::pfnTMUtcNow
+ */
+DECLINLINE(PRTTIMESPEC) PDMDevHlpTMUtcNow(PPDMDEVINS pDevIns, PRTTIMESPEC pTime)
+{
+    return pDevIns->pDevHlpR3->pfnTMUtcNow(pDevIns, pTime);
 }
 

trunk/include/VBox/tm.h

@@ -258 +258 @@
 VMMR3DECL(void)         TMR3TimerQueuesDo(PVM pVM);
 VMM_INT_DECL(void)      TMR3VirtualSyncFF(PVM pVM, PVMCPU pVCpu);
-VMM_INT_DECL(PRTTIMESPEC) TMR3UTCNow(PVM pVM, PRTTIMESPEC pTime);
+VMM_INT_DECL(PRTTIMESPEC) TMR3UtcNow(PVM pVM, PRTTIMESPEC pTime);
 /** @} */
 #endif /* IN_RING3 */

trunk/src/VBox/Devices/PC/DevRTC.cpp

@@ -797 +797 @@
      */
     RTTIMESPEC  Now;
-    PDMDevHlpUTCNow(pDevIns, &Now);
+    PDMDevHlpTMUtcNow(pDevIns, &Now);
     RTTIME Time;
     if (pThis->fUTC)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -372 +372 @@
         else
         {
-            pThis->hostTime = RTTimeSpecGetMilli(PDMDevHlpUTCNow(pDevIns, &now));
+            pThis->hostTime = RTTimeSpecGetMilli(PDMDevHlpTMUtcNow(pDevIns, &now));
             *pu32 = (uint32_t)(pThis->hostTime >> 32);
         }
@@ -715 +715 @@
                 VMMDevReqHostTime *hostTimeReq = (VMMDevReqHostTime*)pRequestHeader;
                 RTTIMESPEC now;
-                hostTimeReq->time = RTTimeSpecGetMilli(PDMDevHlpUTCNow(pDevIns, &now));
+                hostTimeReq->time = RTTimeSpecGetMilli(PDMDevHlpTMUtcNow(pDevIns, &now));
                 pRequestHeader->rc = VINF_SUCCESS;
             }

trunk/src/VBox/VMM/PDMDevHlp.cpp

@@ -585 +585 @@
 
 
-/** @interface_method_impl{PDMDEVHLPR3,pfnUTCNow} */
-static DECLCALLBACK(PRTTIMESPEC) pdmR3DevHlp_UTCNow(PPDMDEVINS pDevIns, PRTTIMESPEC pTime)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    LogFlow(("pdmR3DevHlp_UTCNow: caller='%s'/%d: pTime=%p\n",
+/** @interface_method_impl{PDMDEVHLPR3,pfnTMUtcNow} */
+static DECLCALLBACK(PRTTIMESPEC) pdmR3DevHlp_TMUtcNow(PPDMDEVINS pDevIns, PRTTIMESPEC pTime)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlow(("pdmR3DevHlp_TMUtcNow: caller='%s'/%d: pTime=%p\n",
              pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, pTime));
 
-    pTime = TMR3UTCNow(pDevIns->Internal.s.pVMR3, pTime);
-
-    LogFlow(("pdmR3DevHlp_UTCNow: caller='%s'/%d: returns %RU64\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, RTTimeSpecGetNano(pTime)));
+    pTime = TMR3UtcNow(pDevIns->Internal.s.pVMR3, pTime);
+
+    LogFlow(("pdmR3DevHlp_TMUtcNow: caller='%s'/%d: returns %RU64\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, RTTimeSpecGetNano(pTime)));
     return pTime;
 }
@@ -2805 +2805 @@
     pdmR3DevHlp_SSMRegister,
     pdmR3DevHlp_TMTimerCreate,
-    pdmR3DevHlp_UTCNow,
+    pdmR3DevHlp_TMUtcNow,
     pdmR3DevHlp_PhysRead,
     pdmR3DevHlp_PhysWrite,
@@ -2998 +2998 @@
     pdmR3DevHlp_SSMRegister,
     pdmR3DevHlp_TMTimerCreate,
-    pdmR3DevHlp_UTCNow,
+    pdmR3DevHlp_TMUtcNow,
     pdmR3DevHlp_PhysRead,
     pdmR3DevHlp_PhysWrite,

trunk/src/VBox/VMM/TM.cpp

@@ -2440 +2440 @@
  * @param   pTime           Where to store the time.
  */
-VMM_INT_DECL(PRTTIMESPEC) TMR3UTCNow(PVM pVM, PRTTIMESPEC pTime)
+VMM_INT_DECL(PRTTIMESPEC) TMR3UtcNow(PVM pVM, PRTTIMESPEC pTime)
 {
     RTTimeNow(pTime);