From eb998b4eaf0a339812c7852ce4bfec3f968839de Mon Sep 17 00:00:00 2001
From: Aleksey Bragin <aleksey@reactos.org>
Date: Sun, 1 Oct 2006 21:07:25 +0000
Subject: [PATCH] - Comment out xbox memory detection for now (until fully
 switched to NT-style LPB) - Fix HalpInitializePhase0() prototype - Add
 halxbox back to build

svn path=/trunk/; revision=24353
---
 reactos/hal/halx86/directory.rbuild    | 4 ++--
 reactos/hal/halx86/xbox/display_xbox.c | 6 ++++--
 reactos/hal/halx86/xbox/halinit_xbox.c | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/reactos/hal/halx86/directory.rbuild b/reactos/hal/halx86/directory.rbuild
index c92f9b7f41c..5303d6cd7a9 100644
--- a/reactos/hal/halx86/directory.rbuild
+++ b/reactos/hal/halx86/directory.rbuild
@@ -7,6 +7,6 @@
 <directory name="mp">
 	<xi:include href="mp/halmp.rbuild" />
 </directory>
-<!--<directory name="xbox">
+<directory name="xbox">
 	<xi:include href="xbox/halxbox.rbuild" />
-</directory>-->
+</directory>
diff --git a/reactos/hal/halx86/xbox/display_xbox.c b/reactos/hal/halx86/xbox/display_xbox.c
index be52bd2a5fb..7cf157109ac 100644
--- a/reactos/hal/halx86/xbox/display_xbox.c
+++ b/reactos/hal/halx86/xbox/display_xbox.c
@@ -301,11 +301,13 @@ HalInitializeDisplay (PLOADER_PARAMETER_BLOCK LoaderBlock)
   if (! DisplayInitialized)
     {
       PhysBuffer.u.HighPart = 0;
-      if (0 != (LoaderBlock->Flags & MB_FLAGS_MEM_INFO))
+      //FIXME: We always assume 64Mb Xbox for now, until switch to
+      //       NT-style LPB is finished
+      /*if (0 != (LoaderBlock->Flags & MB_FLAGS_MEM_INFO))
         {
           PhysBuffer.u.LowPart = (LoaderBlock->MemHigher + 1024) * 1024;
         }
-      else
+      else*/
         {
           /* Assume a 64Mb Xbox, last 4MB for video buf */
           PhysBuffer.u.LowPart = 60 * 1024 * 1024;
diff --git a/reactos/hal/halx86/xbox/halinit_xbox.c b/reactos/hal/halx86/xbox/halinit_xbox.c
index ddcec9f45e2..c18d48c2495 100644
--- a/reactos/hal/halx86/xbox/halinit_xbox.c
+++ b/reactos/hal/halx86/xbox/halinit_xbox.c
@@ -19,7 +19,7 @@
 /* FUNCTIONS ***************************************************************/
 
 VOID
-HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock)
+HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
   HalpHooks.InitPciBus = HalpXboxInitPciBus;