mirror of
https://github.com/reactos/reactos.git
synced 2025-02-25 01:39:30 +00:00
UP fixes, was enabling interrupts too early
svn path=/trunk/; revision=1811
This commit is contained in:
parent
6dd0418c50
commit
e344bc3faa
6 changed files with 14 additions and 10 deletions
|
@ -1,4 +1,4 @@
|
|||
/* $Id: display.c,v 1.13 2001/04/17 23:39:25 dwelch Exp $
|
||||
/* $Id: display.c,v 1.14 2001/04/18 03:31:19 dwelch Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
@ -34,8 +34,8 @@
|
|||
|
||||
static ULONG CursorX = 0; /* Cursor Position */
|
||||
static ULONG CursorY = 0;
|
||||
static ULONG SizeX = 0; /* Display size */
|
||||
static ULONG SizeY = 0;
|
||||
static ULONG SizeX = 80; /* Display size */
|
||||
static ULONG SizeY = 25;
|
||||
|
||||
static BOOLEAN DisplayInitialized = FALSE;
|
||||
static BOOLEAN HalOwnsDisplay = TRUE;
|
||||
|
|
|
@ -54,6 +54,9 @@ VOID HalpInitPICs(VOID)
|
|||
/* Mask off all interrupts from PICs */
|
||||
WRITE_PORT_UCHAR((PUCHAR)0x21, 0xff);
|
||||
WRITE_PORT_UCHAR((PUCHAR)0xa1, 0xff);
|
||||
|
||||
/* We can know enable interrupts */
|
||||
__asm__ __volatile__ ("sti\n\t");
|
||||
}
|
||||
|
||||
static ULONG
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: mp.c,v 1.11 2001/04/17 23:39:25 dwelch Exp $
|
||||
/* $Id: mp.c,v 1.12 2001/04/18 03:31:19 dwelch Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
@ -2360,6 +2360,9 @@ HalpInitMPS(
|
|||
/* Setup I/O APIC */
|
||||
IOAPICSetup();
|
||||
|
||||
/* We can now enable interrupts */
|
||||
__asm__ __volatile__ ("sti\n\t");
|
||||
|
||||
/* Setup busy waiting */
|
||||
HalpCalibrateStallExecution();
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
* MA 02139, USA.
|
||||
*
|
||||
*/
|
||||
/* $Id: udelay.c,v 1.8 2001/04/13 16:12:25 chorns Exp $
|
||||
/* $Id: udelay.c,v 1.9 2001/04/18 03:31:19 dwelch Exp $
|
||||
*
|
||||
* PROJECT: ReactOS kernel
|
||||
* FILE: ntoskrnl/hal/x86/udelay.c
|
||||
|
@ -196,7 +196,7 @@ VOID HalpCalibrateStallExecution(VOID)
|
|||
|
||||
__KeStallExecutionProcessor(delay_count); /* Do the delay */
|
||||
|
||||
CurCount = Read8254Timer();
|
||||
CurCount = Read8254Timer();
|
||||
if (CurCount <= LATCH / 2) /* If a tick has passed, turn the */
|
||||
delay_count &= ~calib_bit; /* calibrated bit back off */
|
||||
}
|
||||
|
|
|
@ -2,6 +2,6 @@
|
|||
#ifndef __NTOSKRNL_INCLUDE_INTERNAL_CONFIG_H
|
||||
#define __NTOSKRNL_INCLUDE_INTERNAL_CONFIG_H
|
||||
#define DBG
|
||||
#define UP
|
||||
#define CONFIG "DBG UP"
|
||||
#define MP
|
||||
#define CONFIG "DBG MP"
|
||||
#endif /* __NTOSKRNL_INCLUDE_INTERNAL_CONFIG_H */
|
||||
|
|
|
@ -124,8 +124,6 @@ KeInit1(VOID)
|
|||
PcrsAllocated++;
|
||||
|
||||
Ki386InitializeLdt();
|
||||
|
||||
__asm__ __volatile__ ("sti\n\t");
|
||||
}
|
||||
|
||||
VOID
|
||||
|
|
Loading…
Reference in a new issue