Big merge: thanks alex and greatlord. Not a complete merge but most

[reactos.git] / reactos / ntoskrnl / ke / freeldr.c

diff --git a/reactos/ntoskrnl/ke/freeldr.c b/reactos/ntoskrnl/ke/freeldr.c
index a2a2159..d30e85a 100644 (file)
--- a/reactos/ntoskrnl/ke/freeldr.c
+++ b/reactos/ntoskrnl/ke/freeldr.c
@@ -41,6 +41,7 @@ VOID
 NTAPI
 KiRosPrepareForSystemStartup(IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock)
 {
+#ifdef _M_IX86
     ULONG i;
     ULONG size;
     ULONG HalBase;
@@ -189,6 +190,18 @@ KiRosPrepareForSystemStartup(IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock)
     /* Setup the IDT */
     KeInitExceptions(); // ONCE HACK BELOW IS GONE, MOVE TO KISYSTEMSTARTUP!
     KeInitInterrupts(); // ROS HACK DEPRECATED SOON BY NEW HAL
+#elif defined(_M_PPC)
+    ULONG DriverBase = 0;
+    ULONG DriverSize = 0;
+    
+    memset( KeLoaderModules, 0, sizeof(KeLoaderModules) );
+    memset( KeLoaderCommandLine, 0, sizeof(KeLoaderCommandLine) );
+    memset( KeLoaderModuleStrings, 0, sizeof(KeLoaderModuleStrings) );
+
+    /* Stop here for now -- we'll write this part later */
+    char *foo = 0;
+    *foo = 1;
+#endif
 
     /* Load the Kernel with the PE Loader */
     LdrSafePEProcessModule((PVOID)KERNEL_BASE,