Author: fireball Date: Mon Oct 2 01:07:25 2006 New Revision: 24353
URL: http://svn.reactos.org/svn/reactos?rev=24353&view=rev Log: - Comment out xbox memory detection for now (until fully switched to NT-style LPB) - Fix HalpInitializePhase0() prototype - Add halxbox back to build
Modified: trunk/reactos/hal/halx86/directory.rbuild trunk/reactos/hal/halx86/xbox/display_xbox.c trunk/reactos/hal/halx86/xbox/halinit_xbox.c
Modified: trunk/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuild... ============================================================================== --- trunk/reactos/hal/halx86/directory.rbuild (original) +++ trunk/reactos/hal/halx86/directory.rbuild Mon Oct 2 01:07:25 2006 @@ -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>
Modified: trunk/reactos/hal/halx86/xbox/display_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/display_xbo... ============================================================================== --- trunk/reactos/hal/halx86/xbox/display_xbox.c (original) +++ trunk/reactos/hal/halx86/xbox/display_xbox.c Mon Oct 2 01:07:25 2006 @@ -301,11 +301,13 @@ 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;
Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/halinit_xbo... ============================================================================== --- trunk/reactos/hal/halx86/xbox/halinit_xbox.c (original) +++ trunk/reactos/hal/halx86/xbox/halinit_xbox.c Mon Oct 2 01:07:25 2006 @@ -19,7 +19,7 @@ /* FUNCTIONS ***************************************************************/
VOID -HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock) +HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) { HalpHooks.InitPciBus = HalpXboxInitPciBus;