Changeset 37539 in vbox

Timestamp:

Jun 17, 2011 1:04:56 PM (13 years ago)

Author:

vboxsync

Message:

DevHPET: Moved the frequency hinting into a function.

File:

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

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

@@ -366 +366 @@
 }
 
+
+/**
+ * Sets the frequency hint if it's a periodic timer.
+ *
+ * @param   pThis       The HPET state.
+ * @param   pHpetTimer  The timer.
+ */
+DECLINLINE(void) hpetTimerSetFrequencyHint(HpetState *pThis, HpetTimer *pHpetTimer)
+{
+    if (pHpetTimer->u64Config & HPET_TN_PERIODIC)
+    {
+        uint64_t const u64Period = pHpetTimer->u64Period;
+        uint32_t const u32Freq   = pThis->u32Period;
+        if (u64Period > 0 && u64Period < u32Freq)
+            TMTimerSetFrequencyHint(pHpetTimer->CTX_SUFF(pTimer), u32Freq / (uint32_t)u64Period);
+    }
+}
+
+
 static void hpetProgramTimer(HpetTimer *pHpetTimer)
 {
@@ -403 +422 @@
     Log4(("HPET: next IRQ in %lld ticks (%lld ns)\n", u64Diff, hpetTicksToNs(pHpetTimer->CTX_SUFF(pHpet), u64Diff)));
     TMTimerSetNano(pHpetTimer->CTX_SUFF(pTimer), hpetTicksToNs(pHpetTimer->CTX_SUFF(pHpet), u64Diff));
-    if (pHpetTimer->u64Config & HPET_TN_PERIODIC)
-    {
-        uint64_t const u64Period = pHpetTimer->u64Period;
-        uint32_t const u32Freq   = pHpetTimer->CTX_SUFF(pHpet)->u32Period;
-        if (u64Period > 0 && u64Period < u32Freq)
-            TMTimerSetFrequencyHint(pHpetTimer->CTX_SUFF(pTimer), u32Freq / (uint32_t)u64Period);
-    }
+    hpetTimerSetFrequencyHint(pHpetTimer->CTX_SUFF(pHpet), pHpetTimer);
 }
 
@@ -1248 +1261 @@
     {
         HpetTimer *pHpetTimer = &pThis->aTimers[iTimer];
-        if (   (pHpetTimer->u64Config & HPET_TN_PERIODIC)
-            && TMTimerIsActive(pHpetTimer->CTX_SUFF(pTimer)))
-        {
-            uint64_t const u64Period = pHpetTimer->u64Period;
-            uint32_t const u32Freq   = pHpetTimer->CTX_SUFF(pHpet)->u32Period;
-            if (u64Period > 0 && u64Period < u32Freq)
-                TMTimerSetFrequencyHint(pHpetTimer->CTX_SUFF(pTimer), u32Freq / (uint32_t)u64Period);
-        }
+        if (TMTimerIsActive(pHpetTimer->CTX_SUFF(pTimer)))
+            hpetTimerSetFrequencyHint(pThis, pHpetTimer);
     }
     PDMCritSectLeave(&pThis->csLock);