Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 09:46:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Use macros instead of magic "1" and "2" for Setup Loader Block Flags

Browse source 
- Initialize AcpiTableDetected to FALSE
- Misc header fixes

svn path=/trunk/; revision=35012
This commit is contained in:
Stefan Ginsberg 2008-08-01 16:47:17 +00:00
parent 50560726e9
commit f0ae9e7e83
4 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
reactos/include/reactos/arc/arc.h
View file

@ -412,7 +412,8 @@ typedef struct _FIRMWARE_INFORMATION_LOADER_BLOCK
{ {
ULONG FirmwareTypeEfi:1; ULONG FirmwareTypeEfi:1;
ULONG Reserved:31; ULONG Reserved:31;
union { union
{
EFI_FIRMWARE_INFORMATION EfiInformation; EFI_FIRMWARE_INFORMATION EfiInformation;
PCAT_FIRMWARE_INFORMATION PcatInformation; PCAT_FIRMWARE_INFORMATION PcatInformation;
} u; } u;
@ -447,7 +448,7 @@ typedef struct _LOADER_PARAMETER_BLOCK
{ {
I386_LOADER_BLOCK I386; I386_LOADER_BLOCK I386;
ALPHA_LOADER_BLOCK Alpha; ALPHA_LOADER_BLOCK Alpha;
IA64_LOADER_BLOCK Ia64; IA64_LOADER_BLOCK IA64;
PPC_LOADER_BLOCK PowerPC; PPC_LOADER_BLOCK PowerPC;
ARM_LOADER_BLOCK Arm; ARM_LOADER_BLOCK Arm;
} u; } u;

6
reactos/include/reactos/arc/setupblk.h
View file

@ -1,6 +1,12 @@
#ifndef _SETUPBLK_ #ifndef _SETUPBLK_
#define _SETUPBLK_ #define _SETUPBLK_
//
// Setup Flags
//
#define SETUPLDR_TEXT_MODE 0x1
#define SETUPLDR_REMOTE_BOOT 0x2
// //
// Type of file described in DETECTED_DEVICE_FILE // Type of file described in DETECTED_DEVICE_FILE
// //

4
reactos/ntoskrnl/ex/init.c
View file

@ -869,10 +869,10 @@ ExpInitializeExecutive(IN ULONG Cpu,
if (LoaderBlock->SetupLdrBlock) if (LoaderBlock->SetupLdrBlock)
{ {
/* Check if this is text-mode setup */ /* Check if this is text-mode setup */
if (LoaderBlock->SetupLdrBlock->Flags & 1) ExpInTextModeSetup = TRUE; if (LoaderBlock->SetupLdrBlock->Flags & SETUPLDR_TEXT_MODE) ExpInTextModeSetup = TRUE;
/* Check if this is network boot */ /* Check if this is network boot */
if (LoaderBlock->SetupLdrBlock->Flags & 2) if (LoaderBlock->SetupLdrBlock->Flags & SETUPLDR_REMOTE_BOOT)
{ {
/* Set variable */ /* Set variable */
IoRemoteBootClient = TRUE; IoRemoteBootClient = TRUE;

4
reactos/ntoskrnl/ke/freeldr.c
View file

@ -31,7 +31,7 @@ typedef struct _BIOS_MEMORY_DESCRIPTOR
/* FreeLDR Loader Data */ /* FreeLDR Loader Data */
PROS_LOADER_PARAMETER_BLOCK KeRosLoaderBlock; PROS_LOADER_PARAMETER_BLOCK KeRosLoaderBlock;
BOOLEAN AcpiTableDetected; BOOLEAN AcpiTableDetected = FALSE;
ADDRESS_RANGE KeMemoryMap[64]; ADDRESS_RANGE KeMemoryMap[64];
ULONG KeMemoryMapRangeCount; ULONG KeMemoryMapRangeCount;
@ -1187,7 +1187,7 @@ KiRosFrldrLpbToNtLpb(IN PROS_LOADER_PARAMETER_BLOCK RosLoaderBlock,
if (LoaderBlock->SetupLdrBlock) if (LoaderBlock->SetupLdrBlock)
{ {
/* All we'll setup right now is the flag for text-mode setup */ /* All we'll setup right now is the flag for text-mode setup */
LoaderBlock->SetupLdrBlock->Flags = 1; LoaderBlock->SetupLdrBlock->Flags = SETUPLDR_TEXT_MODE;
} }
/* Make a copy of the command line */ /* Make a copy of the command line */