mirror of
https://github.com/reactos/reactos.git
synced 2024-10-25 15:36:07 +00:00
Set the ACPI flag in loader block *after* performing the ACPI detection.
svn path=/trunk/; revision=14112
This commit is contained in:
parent
d001f75197
commit
3f249a0a67
|
@ -578,9 +578,9 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
|
||||||
PARTITION_TABLE_ENTRY PartitionTableEntry;
|
PARTITION_TABLE_ENTRY PartitionTableEntry;
|
||||||
ULONG rosPartition;
|
ULONG rosPartition;
|
||||||
|
|
||||||
extern ULONG PageDirectoryStart;
|
extern ULONG PageDirectoryStart;
|
||||||
extern ULONG PageDirectoryEnd;
|
extern ULONG PageDirectoryEnd;
|
||||||
extern BOOLEAN AcpiPresent;
|
extern BOOLEAN AcpiPresent;
|
||||||
|
|
||||||
//
|
//
|
||||||
// Open the operating system section
|
// Open the operating system section
|
||||||
|
@ -597,7 +597,6 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
|
||||||
* Setup multiboot information structure
|
* 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;
|
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.PageDirectoryStart = (ULONG)&PageDirectoryStart;
|
||||||
LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd;
|
LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd;
|
||||||
LoaderBlock.BootDevice = 0xffffffff;
|
LoaderBlock.BootDevice = 0xffffffff;
|
||||||
|
@ -736,6 +735,7 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
|
||||||
*/
|
*/
|
||||||
MachHwDetect();
|
MachHwDetect();
|
||||||
|
|
||||||
|
if (AcpiPresent) LoaderBlock.Flags |= MB_INFO_FLAG_ACPI_TABLE;
|
||||||
|
|
||||||
UiDrawStatusText("Loading...");
|
UiDrawStatusText("Loading...");
|
||||||
UiDrawProgressBarCenter(0, 100, "Loading ReactOS...");
|
UiDrawProgressBarCenter(0, 100, "Loading ReactOS...");
|
||||||
|
|
Loading…
Reference in a new issue