From 3f249a0a678dc58d9e6649130eb83d7730841d38 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Tue, 15 Mar 2005 23:02:12 +0000 Subject: [PATCH] Set the ACPI flag in loader block *after* performing the ACPI detection. svn path=/trunk/; revision=14112 --- reactos/boot/freeldr/freeldr/reactos/reactos.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/boot/freeldr/freeldr/reactos/reactos.c b/reactos/boot/freeldr/freeldr/reactos/reactos.c index 0e1e4e0aedc..9cafa6a17da 100644 --- a/reactos/boot/freeldr/freeldr/reactos/reactos.c +++ b/reactos/boot/freeldr/freeldr/reactos/reactos.c @@ -578,9 +578,9 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName) 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 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName) * 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 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName) */ MachHwDetect(); + if (AcpiPresent) LoaderBlock.Flags |= MB_INFO_FLAG_ACPI_TABLE; UiDrawStatusText("Loading..."); UiDrawProgressBarCenter(0, 100, "Loading ReactOS...");