Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes to un-break trunk:

Browse source 
* Disabling XBox HAL for now (TEMPORARY MEASURE)
 * Port MP HAL to the new loader structures

svn path=/trunk/; revision=24325
This commit is contained in:
KJK::Hyperion 2006-09-30 23:35:17 +00:00
parent 7227204f68
commit ae3c3041f4
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/hal/halx86/directory.rbuild
View file

@ -7,6 +7,6 @@
<directory name="mp"> <directory name="mp">
<xi:include href="mp/halmp.rbuild" /> <xi:include href="mp/halmp.rbuild" />
</directory> </directory>
<directory name="xbox"> <!--<directory name="xbox">
<xi:include href="xbox/halxbox.rbuild" /> <xi:include href="xbox/halxbox.rbuild" />
</directory> </directory>-->

2
reactos/hal/halx86/include/hal.h
View file

@ -18,7 +18,7 @@
#include <iotypes.h> #include <iotypes.h>
#include <kefuncs.h> #include <kefuncs.h>
#include <halfuncs.h> #include <halfuncs.h>
#include <rosldr.h> #include <ldrtypes.h>
#define KPCR_BASE 0xFF000000 // HACK! #define KPCR_BASE 0xFF000000 // HACK!

6
reactos/hal/halx86/mp/halinit_mp.c
View file

@ -22,7 +22,7 @@ ULONG_PTR KernelBase;
/***************************************************************************/ /***************************************************************************/
VOID VOID
HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock) HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock)
{ {
static BOOLEAN MPSInitialized = FALSE; static BOOLEAN MPSInitialized = FALSE;
@ -35,7 +35,7 @@ HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock)
DPRINT("HalpInitPhase0()\n"); DPRINT("HalpInitPhase0()\n");
if (MPSInitialized) if (MPSInitialized)
{ {
KEBUGCHECK(0); KEBUGCHECK(0);
} }
@ -48,7 +48,7 @@ HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock)
} }
/* store the kernel base for later use */ /* store the kernel base for later use */
KernelBase = ((PLOADER_MODULE)LoaderBlock->ModsAddr)[0].ModStart; KernelBase = (ULONG_PTR)CONTAINING_RECORD(LoaderBlock->LoadOrderListHead.Flink, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks)->DllBase;
} }