- Fixed crash on reboot. Sorry.

svn path=/trunk/; revision=8784
This commit is contained in:
David Welch 2004-03-18 19:58:35 +00:00
parent 177645b96c
commit 5ab4f36e65
2 changed files with 11 additions and 7 deletions

View file

@ -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 @@ HalInitSystem (ULONG BootPhase,
{
/* Go to blue screen */
HalClearDisplay (0x17); /* grey on blue */
HalpZeroPageMapping = MmMapIoSpace((LARGE_INTEGER)0LL, PAGE_SIZE, FALSE);
}
return TRUE;

View file

@ -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 @@ static VOID
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__)