Changeset 35178 in vbox

Timestamp:

Dec 16, 2010 1:06:34 PM (14 years ago)

Author:

vboxsync

Message:

PIT: Modes 2/6 and 3/7 are identical.

File:

• trunk/src/VBox/Devices/PC/DevPit-i8254.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/PC/DevPit-i8254.cpp

@@ -88 +88 @@
 #endif
 
+/** The effective counter mode - if bit 1 is set, bit 2 is ignored. */
+#define EFFECTIVE_MODE(x)   ((x) & ~(((x) & 2) << 1))
 
 /*******************************************************************************
@@ -188 +190 @@
     PTMTIMER pTimer = s->CTX_SUFF(pPit)->channels[0].CTX_SUFF(pTimer);
 
-    if (s->mode == 2)
+    if (EFFECTIVE_MODE(s->mode) == 2)
     {
         if (s->u64NextTS == UINT64_MAX)
@@ -205 +207 @@
     }
     d = ASMMultU64ByU32DivByU32(TMTimerGet(pTimer) - s->count_load_time, PIT_FREQ, TMTimerGetFreq(pTimer));
-    switch(s->mode) {
+    switch(EFFECTIVE_MODE(s->mode)) {
     case 0:
     case 1:
@@ -232 +234 @@
 
     d = ASMMultU64ByU32DivByU32(current_time - s->count_load_time, PIT_FREQ, TMTimerGetFreq(pTimer));
-    switch(s->mode) {
+    switch(EFFECTIVE_MODE(s->mode)) {
     default:
     case 0:
@@ -293 +295 @@
     Assert((val & 1) == val);
 
-    switch(s->mode) {
+    switch(EFFECTIVE_MODE(s->mode)) {
     default:
     case 0:
@@ -357 +359 @@
 
     d = ASMMultU64ByU32DivByU32(current_time - s->count_load_time, PIT_FREQ, TMTimerGetFreq(pTimer));
-    switch(s->mode) {
+    switch(EFFECTIVE_MODE(s->mode)) {
     default:
     case 0:
@@ -436 +438 @@
         pDevIns = s->CTX_SUFF(pPit)->pDevIns;
 
-        if (s->mode == 2)
+        if (EFFECTIVE_MODE(s->mode) == 2)
         {
             /* We just flip-flop the irq level to save that extra timer call, which isn't generally required (we haven't served it for years). */