Set the ACPI flag in loader block *after* performing the ACPI detection.
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
_____
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
--- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
2005-03-15 22:26:12 UTC (rev 14111)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
2005-03-15 23:02:12 UTC (rev 14112)
@@ -578,9 +578,9 @@
PARTITION_TABLE_ENTRY PartitionTableEntry;
ULONG rosPartition;
- extern ULONG PageDirectoryStart;
- extern ULONG PageDirectoryEnd;
- extern BOOLEAN AcpiPresent;
+ extern ULONG PageDirectoryStart;
+ extern ULONG PageDirectoryEnd;
+ extern BOOLEAN AcpiPresent;
//
// Open the operating system section
@@ -597,7 +597,6 @@
* Setup multiboot information structure
*/
LoaderBlock.Flags = MB_INFO_FLAG_MEM_SIZE |
MB_INFO_FLAG_BOOT_DEVICE | MB_INFO_FLAG_COMMAND_LINE |
MB_INFO_FLAG_MODULES;
- if (AcpiPresent) LoaderBlock.Flags |= MB_INFO_FLAG_ACPI_TABLE;
LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart;
LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd;
LoaderBlock.BootDevice = 0xffffffff;
@@ -736,6 +735,7 @@
*/
MachHwDetect();
+ if (AcpiPresent) LoaderBlock.Flags |= MB_INFO_FLAG_ACPI_TABLE;
UiDrawStatusText("Loading...");
UiDrawProgressBarCenter(0, 100, "Loading ReactOS...");
Show replies by date