- 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
This commit is contained in:
Aleksey Bragin
2006-10-01 21:07:25 +00:00
parent 0c1b724e79
commit eb998b4eaf
3 changed files with 7 additions and 5 deletions
+2 -2
View File
@@ -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>
+4 -2
View File
@@ -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;
+1 -1
View File
@@ -19,7 +19,7 @@
/* FUNCTIONS ***************************************************************/
VOID
HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock)
HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock)
{
HalpHooks.InitPciBus = HalpXboxInitPciBus;