ahh

DarkFire01 · Oct 2, 2024 · 2dbcc93 · 2dbcc93
1 parent 533e1c4
commit 2dbcc93
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 12 deletions.
diff --git a/boot/bootdata/hybridcd.ini b/boot/bootdata/hybridcd.ini
@@ -1,6 +1,6 @@
 [FREELOADER]
-DefaultOS=Setup
-TimeOut=5
+DefaultOS=LiveCD_RamDisk_Debug
+TimeOut=0
 
 [Display]
 TitleText=ReactOS Hybrid-CD

diff --git a/boot/freeldr/freeldr/arch/uefi/uefihw.c b/boot/freeldr/freeldr/arch/uefi/uefihw.c
@@ -785,8 +785,8 @@ DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
     /* Increment bus number */
     (*BusNumber)++;
 
-        DetectKeyboardController(BusKey);
-    DetectPS2Mouse(BusKey);
+  //     DetectKeyboardController(BusKey);
+  // DetectPS2Mouse(BusKey);
   //  DetectDisplayController(BusKey);
     /* Detect ISA/BIOS devices */
     DetectBiosDisks(SystemKey, BusKey);
@@ -796,11 +796,12 @@ DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
     /* FIXME: Detect more ISA devices */
 }
 
-
+    PLOADER_PARAMETER_BLOCK PubLoaderBlock;
 static
 PRSDP_DESCRIPTOR
 FindAcpiBios(VOID)
 {
+        PLOADER_PARAMETER_EXTENSION Extension;
     UINTN i;
     RSDP_DESCRIPTOR* rsdp = NULL;
     EFI_GUID acpi2_guid = EFI_ACPI_20_TABLE_GUID;
@@ -815,6 +816,18 @@ FindAcpiBios(VOID)
         }
     }
 
+
+    Extension = PubLoaderBlock->Extension;
+
+    /* FIXME! HACK value for docking profile */
+    Extension->Profile.Status = 2;
+
+    /* Check if FreeLdr detected a ACPI table */
+        /* Set the pointer to something for compatibility */
+        Extension->AcpiTable = (PVOID)rsdp;
+        // FIXME: Extension->AcpiTableSize;
+
+
     return rsdp;
 }
 
@@ -1112,7 +1125,7 @@ UefiHwDetect(
     DetectInternal(SystemKey, &BusNumber);
 
      DetectPci(SystemKey, &BusNumber);
-
+    DetectIsaBios(SystemKey, &BusNumber);
     TRACE("DetectHardware() Done\n");
     return SystemKey;
 }
diff --git a/boot/freeldr/freeldr/lib/debug.c b/boot/freeldr/freeldr/lib/debug.c
@@ -22,7 +22,7 @@
 
 #if DBG
 
- #define DEBUG_ALL
+// #define DEBUG_ALL
 // #define DEBUG_WARN
 // #define DEBUG_ERR
 // #define DEBUG_INIFILE

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)1;
         // FIXME: Extension->AcpiTableSize;
     }
 
@@ -1165,6 +1165,9 @@ LoadAndBootWindows(
                                     BootPath);
 }
 
+#ifdef UEFIBOOT
+extern PLOADER_PARAMETER_BLOCK PubLoaderBlock;
+#endif
 ARC_STATUS
 LoadAndBootWindowsCommon(
     IN USHORT OperatingSystemVersion,
@@ -1190,6 +1193,11 @@ LoadAndBootWindowsCommon(
     /* Convert BootPath to SystemRoot */
     SystemRoot = strstr(BootPath, "\\");
 
+
+#ifdef UEFIBOOT
+    PubLoaderBlock = LoaderBlock;
+#endif
+
     /* Detect hardware */
     UiUpdateProgressBar(20, "Detecting hardware...");
     LoaderBlock->ConfigurationRoot = MachHwDetect(BootOptions);

diff --git a/drivers/bus/acpi/osl.c b/drivers/bus/acpi/osl.c
@@ -38,7 +38,7 @@ AcpiOsTerminate(void)
 
     return AE_OK;
 }
-
+ UINT64 HalpGetAcpiTables();
 ACPI_PHYSICAL_ADDRESS
 AcpiOsGetRootPointer (
     void)
@@ -47,7 +47,8 @@ AcpiOsGetRootPointer (
 
     DPRINT("AcpiOsGetRootPointer\n");
 
-    AcpiFindRootPointer(&pa);
+    pa = HalpGetAcpiTables();
+    //AcpiFindRootPointer(&pa);
     return pa;
 }
 

diff --git a/hal/hal.spec b/hal/hal.spec
@@ -38,6 +38,7 @@
 @ stdcall HalQueryRealTimeClock(ptr)
 @ stdcall HalReadDmaCounter(ptr)
 @ stdcall HalReportResourceUsage()
+@ stdcall HalpGetAcpiTables()
 @ stdcall HalRequestIpi(long)
 @ fastcall HalRequestSoftwareInterrupt(long)
 @ stdcall HalReturnToFirmware(long)

diff --git a/hal/halx86/acpi/halacpi.c b/hal/halx86/acpi/halacpi.c
@@ -45,6 +45,14 @@ PWCHAR HalHardwareIdString = L"acpipic_up";
 PWCHAR HalName = L"ACPI Compatible Eisa/Isa HAL";
 
 /* PRIVATE FUNCTIONS **********************************************************/
+extern PLOADER_PARAMETER_BLOCK LocLoaderBlock;
+
+ UINT64 NTAPI
+ HalpGetAcpiTables()
+{
+    __debugbreak();
+    return (UINT64)LocLoaderBlock->Extension->AcpiTable;
+}
 
 PDESCRIPTION_HEADER
 NTAPI

diff --git a/hal/halx86/apic/halinit.c b/hal/halx86/apic/halinit.c
@@ -18,7 +18,8 @@ NTAPI
 ApicInitializeLocalApic(ULONG Cpu);
 
 /* FUNCTIONS ****************************************************************/
-
+/* PRIVATE FUNCTIONS **********************************************************/
+PLOADER_PARAMETER_BLOCK LocLoaderBlock;
 VOID
 NTAPI
 HalpInitProcessor(
@@ -30,6 +31,8 @@ HalpInitProcessor(
         HalpParseApicTables(LoaderBlock);
     }
 
+    LocLoaderBlock = LoaderBlock;
+
     HalpSetupProcessorsTable(ProcessorNumber);
 
     /* Initialize the local APIC for this cpu */

diff --git a/win32ss/drivers/miniport/vga/CMakeLists.txt b/win32ss/drivers/miniport/vga/CMakeLists.txt
@@ -8,5 +8,5 @@ add_library(vga MODULE ${SOURCE} vgamp.rc)
 set_module_type(vga kernelmodedriver)
 add_importlibs(vga videoprt)
 add_pch(vga vgamp.h SOURCE)
-add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all)
+#add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all)
 add_registry_inf(vga_reg.inf)