Changeset 20400 in vbox

Timestamp:

Jun 8, 2009 1:03:07 PM (16 years ago)

Author:

vboxsync

Message:

ACPI: refactoring, prepare for dynamic DSDT generation

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (3 diffs)
• PC/DevACPI.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -273 +273 @@
         PC/DevPIC.cpp \
         PC/DevACPI.cpp \
+        PC/ACPI/VBoxAcpi.cpp \
         PC/DevRTC.cpp \
         PC/DevPcBios.cpp \
@@ -387 +388 @@
 endif
 
+ifdef VBOX_WITH_DYNAMIC_DSDT
+DevicesR3_DEFS          += VBOX_WITH_DYNAMIC_DSDT
+endif
+
 ifdef VBOX_WITH_USB
 DevicesR3_DEFS         += VBOX_WITH_USB IN_USB_R3
@@ -404 +409 @@
 DevicesR3_DEFS.l4      += _GNU_SOURCE
 
-# DevACPI.cpp needs vboxaml.hex which we generate from PC/vbox.dsl. (bird: What's vboxaml.aml?)
+# VBoxAcpi.cpp needs vboxaml.hex which we generate from PC/vbox.dsl. (bird: What's vboxaml.aml?)
 DevicesR3_CLEAN        += $(PATH_DevicesR3)/vboxaml.hex $(PATH_DevicesR3)/vboxaml.aml
-PC/DevACPI.cpp_DEPS     = $(PATH_DevicesR3)/vboxaml.hex
-PC/DevACPI.cpp_INCS     = $(PATH_DevicesR3)
+PC/ACPI/VBoxAcpi.cpp_DEPS     = $(PATH_DevicesR3)/vboxaml.hex
+PC/ACPI/VBoxAcpi.cpp_INCS     = $(PATH_DevicesR3)
 
 $$(PATH_DevicesR3)/vboxaml.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)

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

@@ -41 +41 @@
 #endif
 
-/* the compiled DSL */
 #if defined(IN_RING3) && !defined(VBOX_DEVICE_STRUCT_TESTCASE)
-# include <vboxaml.hex>
+int acpiPrepareDsdt(PPDMDEVINS pDevIns, void* *ppPtr, size_t *puDsdtLen);
+int acpiCleanupDsdt(PPDMDEVINS pDevIns, void* pPtr);
 #endif /* !IN_RING3 */
 
@@ -611 +611 @@
 
 /** Differentiated System Description Table (DSDT) */
-static void acpiSetupDSDT(ACPIState *s, RTGCPHYS32 addr)
-{
-    acpiPhyscpy(s, addr, AmlCode, sizeof(AmlCode));
+
+static void acpiSetupDSDT(ACPIState *s, RTGCPHYS32 addr, 
+                            void* pPtr, size_t uDsdtLen)
+{
+    acpiPhyscpy(s, addr, pPtr, uDsdtLen);
 }
 
@@ -1747 +1749 @@
     }
 
-    last_addr = RT_ALIGN_32(dsdt_addr + sizeof(AmlCode), 16);
+    void*  pDsdtCode = NULL;
+    size_t uDsdtSize = 0;
+    rc = acpiPrepareDsdt(s->pDevIns, &pDsdtCode, &uDsdtSize);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    last_addr = RT_ALIGN_32(dsdt_addr + uDsdtSize, 16);
     if (last_addr > 0x10000)
         return PDMDEV_SET_ERROR(s->pDevIns, VERR_TOO_MUCH_DATA,
@@ -1758 +1766 @@
     Log(("DSDT 0x%08X\n", dsdt_addr + addend));
     acpiSetupRSDP((ACPITBLRSDP*)s->au8RSDPPage, rsdt_addr + addend, xsdt_addr + addend);
-    acpiSetupDSDT(s, dsdt_addr + addend);
+    acpiSetupDSDT(s, dsdt_addr + addend, pDsdtCode, uDsdtSize);
+    acpiCleanupDsdt(s->pDevIns, pDsdtCode);
     acpiSetupFACS(s, facs_addr + addend);
     acpiSetupFADT(s, fadt_addr + addend, facs_addr + addend, dsdt_addr + addend);