[BOOT] Fix ACPI Initialization

DarkFire01 · Oct 10, 2024 · e860ede · e860ede
1 parent 5e104b3
commit e860ede
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/boot/freeldr/freeldr/arch/i386/hwacpi.c b/boot/freeldr/freeldr/arch/i386/hwacpi.c
@@ -25,7 +25,7 @@ DBG_DEFAULT_CHANNEL(HWDETECT);
 
 BOOLEAN AcpiPresent = FALSE;
 
-static PRSDP_DESCRIPTOR
+PRSDP_DESCRIPTOR
 FindAcpiBios(VOID)
 {
     PUCHAR Ptr;

diff --git a/boot/freeldr/freeldr/arch/uefi/uefihw.c b/boot/freeldr/freeldr/arch/uefi/uefihw.c
@@ -24,7 +24,6 @@ BOOLEAN AcpiPresent = FALSE;
 
 /* FUNCTIONS *****************************************************************/
 
-static
 PRSDP_DESCRIPTOR
 FindAcpiBios(VOID)
 {

diff --git a/boot/freeldr/freeldr/include/arch/pc/hardware.h b/boot/freeldr/freeldr/include/arch/pc/hardware.h
@@ -68,6 +68,9 @@ typedef
 ULONG
 (*GET_SERIAL_PORT)(ULONG Index, PULONG Irq);
 
+PRSDP_DESCRIPTOR
+FindAcpiBios(VOID);
+
 VOID
 DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey,
                 PCONFIGURATION_COMPONENT_DATA BusKey);

diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c
@@ -251,7 +251,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
     if (AcpiPresent)
     {
         /* Set the pointer to something for compatibility */
-        Extension->AcpiTable = (PVOID)1;
+        Extension->AcpiTable = (PVOID)FindAcpiBios();
         // FIXME: Extension->AcpiTableSize;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,6 @@ BOOLEAN AcpiPresent = FALSE; @@
     /* FUNCTIONS *****************************************************************/
-    static
     PRSDP_DESCRIPTOR
     FindAcpiBios(VOID)
     {
@@ Expand Down @@