Changeset 21855 in vbox for trunk/src/VBox/Devices/PC/DevACPI.cpp

Timestamp:

Jul 28, 2009 4:43:30 PM (16 years ago)

Author:

vboxsync

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

50489

Message:

ACPI PM device: a bit more of refactoring and logging

File:

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

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

@@ -1944 +1944 @@
 }
 
+static int acpiUpdatePmHandlers(ACPIState *pThis, RTIOPORT uNewBase)
+{
+    Log(("acpi: rebasing PM 0x%x -> 0x%x\n", pThis->uPmIoPortBase, uNewBase));
+    if (uNewBase != pThis->uPmIoPortBase)
+    {
+        int rc;
+
+        rc = acpiUnregisterPmHandlers(pThis);
+        if (RT_FAILURE(rc))
+            return rc;
+
+        pThis->uPmIoPortBase = uNewBase;
+
+        rc = acpiRegisterPmHandlers(pThis);
+        if (RT_FAILURE(rc))
+            return rc;
+    }
+
+    return VINF_SUCCESS;
+}
+
 static uint32_t acpiPciConfigRead(PPCIDEVICE pPciDev, uint32_t Address, unsigned cb)
 {
@@ -1949 +1970 @@
     ACPIState*  pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
 
+    Log2(("acpi: PCI config read: 0x%x (%d)\n", Address, cb));
+
     return pThis->pfnAcpiPciConfigRead(pPciDev, Address, cb);
 }
@@ -1957 +1980 @@
     ACPIState  *pThis   = PDMINS_2_DATA(pDevIns, ACPIState *);
 
+    Log2(("acpi: PCI config write: 0x%x -> 0x%x (%d)\n", u32Value, Address, cb));
     pThis->pfnAcpiPciConfigWrite(pPciDev, Address, u32Value, cb);
 
@@ -1971 +1995 @@
             uNewBase &= 0xffc0;
 
-            if (uNewBase != pThis->uPmIoPortBase)
-            {
-                rc = acpiUnregisterPmHandlers(pThis);
-                Assert(RT_SUCCESS(rc));
-
-                pThis->uPmIoPortBase = uNewBase;
-
-                rc = acpiRegisterPmHandlers(pThis);
-                Assert(RT_SUCCESS(rc));
-            }
+            rc = acpiUpdatePmHandlers(pThis, uNewBase);
+            Assert(RT_SUCCESS(rc));
         }
     }
@@ -2228 +2244 @@
     s->gpe0_sts          = 0;
     s->uSleepState       = 0;
+
+    /** @todo Should we really reset PM base? */
+    acpiUpdatePmHandlers(s, PM_PORT_BASE);
 
     acpiPlantTables(s);