[ros-diffs] [sginsberg] 35012: - Use macros instead of magic "1" and "2" for Setup Loader Block Flags - Initialize AcpiTableDetected to FALSE - Misc header fixes
sginsberg at svn.reactos.org
sginsberg at svn.reactos.org
Fri Aug 1 18:47:18 CEST 2008
Author: sginsberg
Date: Fri Aug 1 11:47:17 2008
New Revision: 35012
URL: http://svn.reactos.org/svn/reactos?rev=35012&view=rev
Log:
- Use macros instead of magic "1" and "2" for Setup Loader Block Flags
- Initialize AcpiTableDetected to FALSE
- Misc header fixes
Modified:
trunk/reactos/include/reactos/arc/arc.h
trunk/reactos/include/reactos/arc/setupblk.h
trunk/reactos/ntoskrnl/ex/init.c
trunk/reactos/ntoskrnl/ke/freeldr.c
Modified: trunk/reactos/include/reactos/arc/arc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?rev=35012&r1=35011&r2=35012&view=diff
==============================================================================
--- trunk/reactos/include/reactos/arc/arc.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/arc/arc.h [iso-8859-1] Fri Aug 1 11:47:17 2008
@@ -412,7 +412,8 @@
{
ULONG FirmwareTypeEfi:1;
ULONG Reserved:31;
- union {
+ union
+ {
EFI_FIRMWARE_INFORMATION EfiInformation;
PCAT_FIRMWARE_INFORMATION PcatInformation;
} u;
@@ -447,7 +448,7 @@
{
I386_LOADER_BLOCK I386;
ALPHA_LOADER_BLOCK Alpha;
- IA64_LOADER_BLOCK Ia64;
+ IA64_LOADER_BLOCK IA64;
PPC_LOADER_BLOCK PowerPC;
ARM_LOADER_BLOCK Arm;
} u;
Modified: trunk/reactos/include/reactos/arc/setupblk.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/setupblk.h?rev=35012&r1=35011&r2=35012&view=diff
==============================================================================
--- trunk/reactos/include/reactos/arc/setupblk.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/arc/setupblk.h [iso-8859-1] Fri Aug 1 11:47:17 2008
@@ -1,5 +1,11 @@
#ifndef _SETUPBLK_
#define _SETUPBLK_
+
+//
+// Setup Flags
+//
+#define SETUPLDR_TEXT_MODE 0x1
+#define SETUPLDR_REMOTE_BOOT 0x2
//
// Type of file described in DETECTED_DEVICE_FILE
Modified: trunk/reactos/ntoskrnl/ex/init.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=35012&r1=35011&r2=35012&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Fri Aug 1 11:47:17 2008
@@ -869,10 +869,10 @@
if (LoaderBlock->SetupLdrBlock)
{
/* 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 */
- if (LoaderBlock->SetupLdrBlock->Flags & 2)
+ if (LoaderBlock->SetupLdrBlock->Flags & SETUPLDR_REMOTE_BOOT)
{
/* Set variable */
IoRemoteBootClient = TRUE;
Modified: trunk/reactos/ntoskrnl/ke/freeldr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=35012&r1=35011&r2=35012&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] Fri Aug 1 11:47:17 2008
@@ -31,7 +31,7 @@
/* FreeLDR Loader Data */
PROS_LOADER_PARAMETER_BLOCK KeRosLoaderBlock;
-BOOLEAN AcpiTableDetected;
+BOOLEAN AcpiTableDetected = FALSE;
ADDRESS_RANGE KeMemoryMap[64];
ULONG KeMemoryMapRangeCount;
@@ -1187,7 +1187,7 @@
if (LoaderBlock->SetupLdrBlock)
{
/* 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 */
More information about the Ros-diffs
mailing list