Commit in reactos/hal/halx86 on MAIN
reboot.c+4-61.5 -> 1.6
halinit.c+7-11.6 -> 1.7
+11-7
2 modified files

- Fixed crash on reboot. Sorry.

reactos/hal/halx86
reboot.c 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- reboot.c	28 Dec 2003 22:38:09 -0000	1.5
+++ reboot.c	18 Mar 2004 19:58:35 -0000	1.6
@@ -1,4 +1,4 @@
-/* $Id: reboot.c,v 1.5 2003/12/28 22:38:09 fireball Exp $
+/* $Id: reboot.c,v 1.6 2004/03/18 19:58:35 dwelch Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -18,13 +18,11 @@
 HalReboot (VOID)
 {
     char data;
-    BYTE *mem;
+    extern PVOID HalpZeroPageMapping;
 
     /* enable warm reboot */
-    mem = (BYTE *)(0xd0000000 + 0x0000);
-//    mem = HalMapPhysicalMemory (0, 1);
-    mem[0x472] = 0x34;
-    mem[0x473] = 0x12;
+    ((PUCHAR)HalpZeroPageMapping)[0x472] = 0x34;
+    ((PUCHAR)HalpZeroPageMapping)[0x473] = 0x12;
 
     /* disable interrupts */
 #if defined(__GNUC__)

reactos/hal/halx86
halinit.c 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- halinit.c	2 Sep 2003 20:11:43 -0000	1.6
+++ halinit.c	18 Mar 2004 19:58:35 -0000	1.7
@@ -1,4 +1,4 @@
-/* $Id: halinit.c,v 1.6 2003/09/02 20:11:43 ea Exp $
+/* $Id: halinit.c,v 1.7 2004/03/18 19:58:35 dwelch Exp $
  *
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
@@ -22,6 +22,10 @@
 #define NDEBUG
 #include <internal/debug.h>
 
+/* GLOBALS *****************************************************************/
+
+PVOID HalpZeroPageMapping = NULL;
+
 /* FUNCTIONS ***************************************************************/
 
 NTSTATUS
@@ -68,6 +72,8 @@
     {
       /* Go to blue screen */
       HalClearDisplay (0x17); /* grey on blue */
+      
+      HalpZeroPageMapping = MmMapIoSpace((LARGE_INTEGER)0LL, PAGE_SIZE, FALSE);
     }
 
   return TRUE;
CVSspam 0.2.8