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

Timestamp:

Oct 6, 2022 9:44:06 AM (2 years ago)

Author:

vboxsync

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

153962

Message:

HPET: Fixed several calculations and typos, see bugref:10301

File:

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

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

@@ -102 +102 @@
 
 /**
- * Femtoseconds in a day. Still fits within int64_t.
- */
-#define FS_PER_DAY                  (1000000LL * 60 * 60 * 24 * FS_PER_NS)
+ * Femtoseconds in a day. Still fits within uint64_t.
+ */
+#define FS_PER_DAY                  (1000000000ULL * 60 * 60 * 24 * FS_PER_NS)
 
 /**
@@ -465 +465 @@
                                            uint64_t fConfig, uint64_t uPeriod)
 {
-    if (fConfig & HPET_TN_PERIODIC)
+    if ((fConfig & HPET_TN_PERIODIC) && uPeriod && (uPeriod < UINT32_MAX))
     {
         uint64_t const nsPeriod = hpetTicksToNs(pThis, uPeriod);
@@ -641 +641 @@
 
             case HPET_TN_CMP:
-                u64Value = ASMAtomicReadU64(&pHpetTimer->u64Config);
+                u64Value = ASMAtomicReadU64(&pHpetTimer->u64Cmp);
                 Log(("HPET[%u]: read64 HPET_TN_CMP: %#RX64\n", iTimerNo, u64Value));
                 break;
@@ -815 +815 @@
 
 /**
- * 32-bit write to a HPET timer register.
+ * 64-bit write to a HPET timer register.
  *
  * @returns Strict VBox status code.