From 144f1bc166fb95f64ad1d4fb85f82d5d0ab372a5 Mon Sep 17 00:00:00 2001
From: Stefan Ginsberg <stefanginsberg@gmail.com>
Date: Sun, 18 Oct 2009 11:50:34 +0000
Subject: [PATCH] - Use DBG_STATUS_CONTROL_C instead of magic "1" - Add missing
 KdPollBreakIn + DbgBreakPointWithStatus to ARM initialization - Fix
 initialization of the D and I cache fields in the PCR -- it was always
 setting the second level

svn path=/trunk/; revision=43549
---
 reactos/ntoskrnl/ke/arm/kiinit.c     | 13 +++++++++----
 reactos/ntoskrnl/ke/i386/kiinit.c    |  2 +-
 reactos/ntoskrnl/ke/powerpc/kiinit.c |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/reactos/ntoskrnl/ke/arm/kiinit.c b/reactos/ntoskrnl/ke/arm/kiinit.c
index 71aa7d2f932..2a15609ca51 100644
--- a/reactos/ntoskrnl/ke/arm/kiinit.c
+++ b/reactos/ntoskrnl/ke/arm/kiinit.c
@@ -186,6 +186,11 @@ KiInitializeKernel(IN PKPROCESS InitProcess,
         //
         KdInitSystem(0, LoaderBlock);
 
+        //
+        // Check for break-in
+        //
+        if (KdPollBreakIn()) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C);
+
         //
         // Cleanup the rest of the processor block array
         //
@@ -372,12 +377,12 @@ KiInitializeSystem(IN ULONG Magic,
     //
     // Set global d-cache fill and alignment values
     //
-    if (Pcr->SecondLevelDcacheSize)
+    if (!Pcr->SecondLevelDcacheSize)
     {
         //
         // Use the first level
         //
-        Pcr->DcacheFillSize = Pcr->SecondLevelDcacheSize;
+        Pcr->DcacheFillSize = Pcr->FirstLevelDcacheSize;
     }
     else
     {
@@ -395,12 +400,12 @@ KiInitializeSystem(IN ULONG Magic,
     //
     // Set global i-cache fill and alignment values
     //
-    if (Pcr->SecondLevelIcacheSize)
+    if (!Pcr->SecondLevelIcacheSize)
     {
         //
         // Use the first level
         //
-        Pcr->IcacheFillSize = Pcr->SecondLevelIcacheSize;
+        Pcr->IcacheFillSize = Pcr->FirstLevelIcacheSize;
     }
     else
     {
diff --git a/reactos/ntoskrnl/ke/i386/kiinit.c b/reactos/ntoskrnl/ke/i386/kiinit.c
index 857ab6e96af..1983aaf6559 100644
--- a/reactos/ntoskrnl/ke/i386/kiinit.c
+++ b/reactos/ntoskrnl/ke/i386/kiinit.c
@@ -752,7 +752,7 @@ AppCpuInit:
         KdInitSystem(0, KeLoaderBlock);
 
         /* Check for break-in */
-        if (KdPollBreakIn()) DbgBreakPointWithStatus(1);
+        if (KdPollBreakIn()) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C);
     }
 
     /* Raise to HIGH_LEVEL */
diff --git a/reactos/ntoskrnl/ke/powerpc/kiinit.c b/reactos/ntoskrnl/ke/powerpc/kiinit.c
index 788994791b1..a08987aa275 100644
--- a/reactos/ntoskrnl/ke/powerpc/kiinit.c
+++ b/reactos/ntoskrnl/ke/powerpc/kiinit.c
@@ -329,7 +329,7 @@ AppCpuInit:
     /* Check for break-in */
     if (KdPollBreakIn())
     {
-	DbgBreakPointWithStatus(1);
+	DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C);
     }
 
     /* Raise to HIGH_LEVEL */