Fixes to un-break trunk:

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

svn path=/trunk/; revision=24325

diff --git a/reactos/hal/halx86/directory.rbuild b/reactos/hal/halx86/directory.rbuild
index 5303d6c..c92f9b7 100644 (file)
--- 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/include/hal.h b/reactos/hal/halx86/include/hal.h
index b15a4d9..fcac7ee 100644 (file)
--- a/reactos/hal/halx86/include/hal.h
+++ b/reactos/hal/halx86/include/hal.h
@@ -18,7 +18,7 @@
 #include <iotypes.h>
 #include <kefuncs.h>
 #include <halfuncs.h>
-#include <rosldr.h>
+#include <ldrtypes.h>
 
 #define KPCR_BASE 0xFF000000 // HACK!
 

diff --git a/reactos/hal/halx86/mp/halinit_mp.c b/reactos/hal/halx86/mp/halinit_mp.c
index 8d48d8c..9756923 100644 (file)
--- a/reactos/hal/halx86/mp/halinit_mp.c
+++ b/reactos/hal/halx86/mp/halinit_mp.c
@@ -22,7 +22,7 @@ ULONG_PTR KernelBase;
 
 /***************************************************************************/
 VOID
-HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock)
+HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock)
 
 {
    static BOOLEAN MPSInitialized = FALSE;
@@ -35,7 +35,7 @@ HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock)
    DPRINT("HalpInitPhase0()\n");
 
 
-   if (MPSInitialized) 
+   if (MPSInitialized)
    {
       KEBUGCHECK(0);
    }
@@ -48,7 +48,7 @@ HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock)
    }
 
    /* 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;
 
 }