From e344bc3faaf4168503a190df7f4cbb97d0ca2c7a Mon Sep 17 00:00:00 2001
From: David Welch <welch@cwcom.net>
Date: Wed, 18 Apr 2001 03:31:19 +0000
Subject: [PATCH] UP fixes, was enabling interrupts too early

svn path=/trunk/; revision=1811
---
 reactos/ntoskrnl/hal/x86/display.c         | 6 +++---
 reactos/ntoskrnl/hal/x86/irql.c            | 3 +++
 reactos/ntoskrnl/hal/x86/mp.c              | 5 ++++-
 reactos/ntoskrnl/hal/x86/udelay.c          | 4 ++--
 reactos/ntoskrnl/include/internal/config.h | 4 ++--
 reactos/ntoskrnl/ke/i386/kernel.c          | 2 --
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/reactos/ntoskrnl/hal/x86/display.c b/reactos/ntoskrnl/hal/x86/display.c
index 6dc29759ef5..ba3aad664e5 100644
--- a/reactos/ntoskrnl/hal/x86/display.c
+++ b/reactos/ntoskrnl/hal/x86/display.c
@@ -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;
diff --git a/reactos/ntoskrnl/hal/x86/irql.c b/reactos/ntoskrnl/hal/x86/irql.c
index 8baafaa3560..c54e27fdc1e 100644
--- a/reactos/ntoskrnl/hal/x86/irql.c
+++ b/reactos/ntoskrnl/hal/x86/irql.c
@@ -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 
diff --git a/reactos/ntoskrnl/hal/x86/mp.c b/reactos/ntoskrnl/hal/x86/mp.c
index 9bb0b0e6478..23b76c8a406 100644
--- a/reactos/ntoskrnl/hal/x86/mp.c
+++ b/reactos/ntoskrnl/hal/x86/mp.c
@@ -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();
 
diff --git a/reactos/ntoskrnl/hal/x86/udelay.c b/reactos/ntoskrnl/hal/x86/udelay.c
index 0329de7baf5..d580c8aeff3 100644
--- a/reactos/ntoskrnl/hal/x86/udelay.c
+++ b/reactos/ntoskrnl/hal/x86/udelay.c
@@ -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        */
    }
diff --git a/reactos/ntoskrnl/include/internal/config.h b/reactos/ntoskrnl/include/internal/config.h
index e1775bd5f39..162b05090f0 100644
--- a/reactos/ntoskrnl/include/internal/config.h
+++ b/reactos/ntoskrnl/include/internal/config.h
@@ -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 */
diff --git a/reactos/ntoskrnl/ke/i386/kernel.c b/reactos/ntoskrnl/ke/i386/kernel.c
index 083173525ca..2d23c1f31e8 100644
--- a/reactos/ntoskrnl/ke/i386/kernel.c
+++ b/reactos/ntoskrnl/ke/i386/kernel.c
@@ -124,8 +124,6 @@ KeInit1(VOID)
    PcrsAllocated++;
 
    Ki386InitializeLdt();
-
-   __asm__ __volatile__ ("sti\n\t");
 }
 
 VOID