Changeset 34879 in vbox for trunk/src/VBox

Timestamp:

Dec 9, 2010 11:42:16 AM (14 years ago)

Author:

vboxsync

Message:

HPET: minor cleanup, more forgiving behavior

File:

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

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

@@ -706 +706 @@
     uint32_t    iIndex = (uint32_t)(GCPhysAddr - HPET_BASE);
 
-    LogFlow(("hpetMMIORead: %llx (%x)\n", (uint64_t)GCPhysAddr, iIndex));
+    LogFlow(("hpetMMIORead (%d): %llx (%x)\n", cb, (uint64_t)GCPhysAddr, iIndex));
 
     rc = hpetLock(pThis, VINF_IOM_HC_MMIO_READ);
@@ -738 +738 @@
             {
                 AssertMsgFailed(("Unaligned HPET read access\n"));
-                rc = VERR_INTERNAL_ERROR;
+                rc = VINF_SUCCESS;
                 break;
             }
@@ -784 +784 @@
     uint32_t iIndex = (uint32_t)(GCPhysAddr - HPET_BASE);
 
-    LogFlow(("hpetMMIOWrite: %llx (%x) <- %x\n",
-             (uint64_t)GCPhysAddr, iIndex, *(uint32_t*)pv));
+    LogFlow(("hpetMMIOWrite (%d): %llx (%x) <- %x\n",
+             cb, (uint64_t)GCPhysAddr, iIndex, cb >= 4 ? *(uint32_t*)pv : 0xdeadbeef));
 
     rc = hpetLock(pThis, VINF_IOM_HC_MMIO_WRITE);
@@ -796 +796 @@
         case 2:
             Log(("Narrow write: %d\n", cb));
-            rc = VERR_INTERNAL_ERROR;
+            rc = VINF_SUCCESS;
             break;
         case 4:
@@ -820 +820 @@
             {
                 AssertMsgFailed(("Unaligned HPET write access\n"));
-                rc = VERR_INTERNAL_ERROR;
+                rc = VINF_SUCCESS;
                 break;
             }
@@ -1213 +1213 @@
 
     /* Query configuration. */
-#if 1
     rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &fRCEnabled, true);
     if (RT_FAILURE(rc))
@@ -1223 +1222 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: failed to read R0Enabled as boolean"));
-#endif
     /* Initialize the device state */
     rc = hpetInit(pDevIns);