[ros-diffs] [hyperion] 24325: Fixes to un-break trunk: * Disabling XBox HAL for now (TEMPORARY MEASURE) * Port MP HAL to the new loader structures

[hyperion at svn.reactos.org]

Author: hyperion
Date: Sun Oct  1 03:35:17 2006
New Revision: 24325

URL: http://svn.reactos.org/svn/reactos?rev=24325&view=rev
Log:
Fixes to un-break trunk:
 * Disabling XBox HAL for now (TEMPORARY MEASURE)
 * Port MP HAL to the new loader structures

Modified:
    trunk/reactos/hal/halx86/directory.rbuild
    trunk/reactos/hal/halx86/include/hal.h
    trunk/reactos/hal/halx86/mp/halinit_mp.c

Modified: trunk/reactos/hal/halx86/directory.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuild?rev=24325&r1=24324&r2=24325&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/directory.rbuild (original)
+++ trunk/reactos/hal/halx86/directory.rbuild Sun Oct  1 03:35:17 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/include/hal.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?rev=24325&r1=24324&r2=24325&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/include/hal.h (original)
+++ trunk/reactos/hal/halx86/include/hal.h Sun Oct  1 03:35:17 2006
@@ -18,7 +18,7 @@
 #include <iotypes.h>
 #include <kefuncs.h>
 #include <halfuncs.h>
-#include <rosldr.h>
+#include <ldrtypes.h>
 
 #define KPCR_BASE 0xFF000000 // HACK!
 

Modified: trunk/reactos/hal/halx86/mp/halinit_mp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halinit_mp.c?rev=24325&r1=24324&r2=24325&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/mp/halinit_mp.c (original)
+++ trunk/reactos/hal/halx86/mp/halinit_mp.c Sun Oct  1 03:35:17 2006
@@ -22,7 +22,7 @@
 
 /***************************************************************************/
 VOID
-HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock)
+HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock)
 
 {
    static BOOLEAN MPSInitialized = FALSE;
@@ -35,7 +35,7 @@
    DPRINT("HalpInitPhase0()\n");
 
 
-   if (MPSInitialized) 
+   if (MPSInitialized)
    {
       KEBUGCHECK(0);
    }
@@ -48,7 +48,7 @@
    }
 
    /* 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;
 
 }