[FREELDR]: Headless/EMS support is an x86-specific feature (at least for now, until...

svn path=/trunk/; revision=49753

diff --git a/reactos/boot/freeldr/freeldr/freeldr_base.rbuild b/reactos/boot/freeldr/freeldr/freeldr_base.rbuild
index db584d4..0288290 100644 (file)
--- a/reactos/boot/freeldr/freeldr/freeldr_base.rbuild
+++ b/reactos/boot/freeldr/freeldr/freeldr_base.rbuild
@@ -75,7 +75,9 @@
                <file>winldr.c</file>
                <file>wlmemory.c</file>
                <file>wlregistry.c</file>
                <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>
        </directory>
        <file>freeldr.c</file>
        <file>debug.c</file>

diff --git a/reactos/boot/freeldr/freeldr/windows/winldr.c b/reactos/boot/freeldr/freeldr/windows/winldr.c
index 3d53390..073a00a 100644 (file)
--- a/reactos/boot/freeldr/freeldr/windows/winldr.c
+++ b/reactos/boot/freeldr/freeldr/windows/winldr.c
@@ -204,6 +204,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
                Extension->AcpiTable = (PVOID)1;
        }
     
                Extension->AcpiTable = (PVOID)1;
        }
     

+#ifndef _M_ARM

     /* Set headless block pointer */
     extern HEADLESS_LOADER_BLOCK LoaderRedirectionInformation;
     extern BOOLEAN WinLdrTerminalConnected;
     /* Set headless block pointer */
     extern HEADLESS_LOADER_BLOCK LoaderRedirectionInformation;
     extern BOOLEAN WinLdrTerminalConnected;


@@ -222,7 +223,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
             sizeof(HEADLESS_LOADER_BLOCK));
         Extension->HeadlessLoaderBlock = PaToVa(Extension->HeadlessLoaderBlock);
     }
             sizeof(HEADLESS_LOADER_BLOCK));
         Extension->HeadlessLoaderBlock = PaToVa(Extension->HeadlessLoaderBlock);
     }

-
+#endif

        /* Load drivers database */
        strcpy(MiscFiles, BootPath);
        strcat(MiscFiles, "AppPatch\\drvmain.sdb");
        /* Load drivers database */
        strcpy(MiscFiles, BootPath);
        strcat(MiscFiles, "AppPatch\\drvmain.sdb");


@@ -534,10 +535,11 @@ LoadAndBootWindows(PCSTR OperatingSystemName,
        /* Allocate and minimalistic-initialize LPB */
        AllocateAndInitLPB(&LoaderBlock);
     
        /* Allocate and minimalistic-initialize LPB */
        AllocateAndInitLPB(&LoaderBlock);
     

+#ifndef _M_ARM

        /* Setup redirection support */
        extern void WinLdrSetupEms(IN PCHAR BootOptions);
        WinLdrSetupEms(BootOptions);
        /* Setup redirection support */
        extern void WinLdrSetupEms(IN PCHAR BootOptions);
        WinLdrSetupEms(BootOptions);

-
+#endif

        /* Detect hardware */
        UseRealHeap = TRUE;
        LoaderBlock->ConfigurationRoot = MachHwDetect();
        /* Detect hardware */
        UseRealHeap = TRUE;
        LoaderBlock->ConfigurationRoot = MachHwDetect();


@@ -622,7 +624,7 @@ LoadAndBootWindows(PCSTR OperatingSystemName,
        /* Save final value of LoaderPagesSpanned */
        LoaderBlockVA->Extension->LoaderPagesSpanned = LoaderPagesSpanned;
 
        /* 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);
                KiSystemStartup, LoaderBlockVA);
 
        WinLdrpDumpMemoryDescriptors(LoaderBlockVA);