[ros-diffs] [sir_richard] 49753: [FREELDR]: Headless/EMS support is an x86-specific feature (at least for now, until the code is made portable).

Author: sir_richard
Date: Tue Nov 23 17:25:37 2010
New Revision: 49753

URL: http://svn.reactos.org/svn/reactos?rev=49753&view=rev
Log:
[FREELDR]: Headless/EMS support is an x86-specific feature (at least for now, until the code is made portable).

Modified:
    trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild
    trunk/reactos/boot/freeldr/freeldr/windows/winldr.c

Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freeld...
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Tue Nov 23 17:25:37 2010
@@ -75,7 +75,9 @@
    	<file>winldr.c</file>
    	<file>wlmemory.c</file>
    	<file>wlregistry.c</file>
-		<file>headless.c</file>
+		<if property="ARCH" value="i386">
+			<file>headless.c</file>
+		</if>
    </directory>
    <file>freeldr.c</file>
    <file>debug.c</file>

Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/window...
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Tue Nov 23 17:25:37 2010
@@ -204,6 +204,7 @@
    	Extension->AcpiTable = (PVOID)1;
    }

+#ifndef _M_ARM
     /* Set headless block pointer */
     extern HEADLESS_LOADER_BLOCK LoaderRedirectionInformation;
     extern BOOLEAN WinLdrTerminalConnected;
@@ -222,7 +223,7 @@
             sizeof(HEADLESS_LOADER_BLOCK));
         Extension->HeadlessLoaderBlock = PaToVa(Extension->HeadlessLoaderBlock);
     }
-
+#endif
    /* Load drivers database */
    strcpy(MiscFiles, BootPath);
    strcat(MiscFiles, "AppPatch\drvmain.sdb");
@@ -534,10 +535,11 @@
    /* Allocate and minimalistic-initialize LPB */
    AllocateAndInitLPB(&LoaderBlock);

+#ifndef _M_ARM
    	/* Setup redirection support */
    extern void WinLdrSetupEms(IN PCHAR BootOptions);
    WinLdrSetupEms(BootOptions);
-
+#endif
    /* Detect hardware */
    UseRealHeap = TRUE;
    LoaderBlock->ConfigurationRoot = MachHwDetect();
@@ -622,7 +624,7 @@
    /* Save final value of LoaderPagesSpanned */
    LoaderBlockVA->Extension->LoaderPagesSpanned = LoaderPagesSpanned;

-	DPRINTM(DPRINT_WINDOWS, "Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n",
+	printf( "Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n",
    	KiSystemStartup, LoaderBlockVA);

WinLdrpDumpMemoryDescriptors(LoaderBlockVA);