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

Timestamp:

Aug 2, 2017 2:45:18 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

117358

Message:

DevACPI: temporary sanity check (take reset into account)

File:

• trunk/src/VBox/Devices/PC/DevACPI.cpp (modified) (4 diffs)

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

@@ -486 +486 @@
 
     /** @todo DEBUGGING */
-    uint32_t            uPmTimerOld;
-    uint32_t            uPmTimerA;
-    uint32_t            uPmTimerB;
+    uint32_t            uPmTimeOld;
+    uint32_t            uPmTimeA;
+    uint32_t            uPmTimeB;
     uint32_t            Alignment5;
 } ACPIState;
@@ -1763 +1763 @@
 
     /** @todo temporary: sanity check against running backwards */
-    uint32_t uOld = ASMAtomicXchgU32(&pThis->uPmTimerOld, *pu32);
+    uint32_t uOld = ASMAtomicXchgU32(&pThis->uPmTimeOld, *pu32);
     if (*pu32 - uOld >= 0x10000000)
     {
 #if defined(IN_RING0)
-        pThis->uPmTimerA = uOld;
-        pThis->uPmTimerB = *pu32;
+        pThis->uPmTimeA = uOld;
+        pThis->uPmTimeB = *pu32;
         return VERR_TM_TIMER_BAD_CLOCK;
 #elif defined(IN_RING3)
@@ -1786 +1786 @@
     ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
     pHlp->pfnPrintf(pHlp,
-                    "timer: old=%08RX32, current=%08RX32\n", pThis->uPmTimerA, pThis->uPmTimerB);
+                    "timer: old=%08RX32, current=%08RX32\n", pThis->uPmTimeA, pThis->uPmTimeB);
 }
 
@@ -3497 +3497 @@
     pThis->uPmTimerVal       = 0;
     acpiR3PmTimerReset(pThis, pThis->u64PmTimerInitial);
+    pThis->uPmTimeOld        = pThis->uPmTimerVal;
     pThis->uBatteryIndex     = 0;
     pThis->uSystemInfoIndex  = 0;