From 7c7a235e5fdef4efb41c4e8695f5cb880e975638 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 12 Mar 2005 01:11:06 +0000
Subject: [PATCH] Steven Edwards <steven_ed4153@yahoo.com> Revert incorrect
 change - KD_DEBUG_BOOTLOG => KD_DEBUG_FILELOG, /DEBUGPORT=BOOTLOG =>
 /DEBUGPORT=FILE.

svn path=/trunk/; revision=13948
---
 reactos/ntoskrnl/include/internal/kd.h |  2 +-
 reactos/ntoskrnl/kd/dlog.c             |  4 ++--
 reactos/ntoskrnl/kd/kdebug.c           | 14 +++++++-------
 reactos/ntoskrnl/ke/main.c             |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/reactos/ntoskrnl/include/internal/kd.h b/reactos/ntoskrnl/include/internal/kd.h
index 4e773b463bc..e74855b8ae1 100644
--- a/reactos/ntoskrnl/include/internal/kd.h
+++ b/reactos/ntoskrnl/include/internal/kd.h
@@ -16,7 +16,7 @@
 #define KD_DEBUG_SCREEN		0x04
 #define KD_DEBUG_SERIAL		0x08
 #define KD_DEBUG_BOCHS		0x10
-#define KD_DEBUG_BOOTLOG	0x20
+#define KD_DEBUG_FILELOG	0x20
 #define KD_DEBUG_MDA            0x40
 #define KD_DEBUG_KDB            0x80
 #define KD_DEBUG_KDSERIAL       0x100
diff --git a/reactos/ntoskrnl/kd/dlog.c b/reactos/ntoskrnl/kd/dlog.c
index 2e86dcfee0e..3b8e48afedf 100644
--- a/reactos/ntoskrnl/kd/dlog.c
+++ b/reactos/ntoskrnl/kd/dlog.c
@@ -36,11 +36,11 @@ DebugLogDumpMessages(VOID)
   ULONG Offset;
   ULONG Length;
 
-  if (!(KdDebugState & KD_DEBUG_BOOTLOG))
+  if (!(KdDebugState & KD_DEBUG_FILELOG))
     {
       return;
     }
-  KdDebugState &= ~KD_DEBUG_BOOTLOG;
+  KdDebugState &= ~KD_DEBUG_FILELOG;
  
   Offset = (DebugLogEnd + 1) % DEBUGLOG_SIZE;
   do
diff --git a/reactos/ntoskrnl/kd/kdebug.c b/reactos/ntoskrnl/kd/kdebug.c
index b8e923dbfb4..bc403f3cab0 100644
--- a/reactos/ntoskrnl/kd/kdebug.c
+++ b/reactos/ntoskrnl/kd/kdebug.c
@@ -1,4 +1,4 @@
-/* $Id:$
+/* $Id$
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -151,15 +151,15 @@ KdInitSystem(ULONG BootPhase,
 		  if (Value > 0 && Value < 5)
 		    {
 		      KdDebuggerEnabled = TRUE;
-			  KdDebugState |= KD_DEBUG_SERIAL;
+		      KdDebugState |= KD_DEBUG_SERIAL;
 		      LogPortInfo.ComPort = Value;
 		    }
 		}
-	      else if (!_strnicmp(p2, "BOOTLOG", 4) && BootPhase > 0)
+	      else if (!_strnicmp(p2, "FILE", 4) && BootPhase > 0)
 		{
 		  p2 += 4;
 		  KdDebuggerEnabled = TRUE;
-		  KdDebugState |= KD_DEBUG_BOOTLOG;
+		  KdDebugState |= KD_DEBUG_FILELOG;
 		}
 	      else if (!_strnicmp(p2, "MDA", 3) && BootPhase > 0)
 		{
@@ -261,7 +261,7 @@ KdInitSystem(ULONG BootPhase,
       if (KdDebugState & KD_DEBUG_SERIAL  && BootPhase == 0)
 	    KdPortInitializeEx(&LogPortInfo, 0, 0);
 
-      if (KdDebugState & KD_DEBUG_BOOTLOG && BootPhase > 0)
+      if (KdDebugState & KD_DEBUG_FILELOG && BootPhase > 0)
 	    DebugLogInit();
 
       if (KdDebugState & KD_DEBUG_MDA && BootPhase > 0)
@@ -317,7 +317,7 @@ KdInit3(VOID)
 	    PrintString("\n   Serial debugging enabled. COM%ld %ld Baud\n\n",
 			LogPortInfo.ComPort, LogPortInfo.BaudRate);
 
-      if (KdDebugState & KD_DEBUG_BOOTLOG)
+      if (KdDebugState & KD_DEBUG_FILELOG)
 	    PrintString("\n   File log debugging enabled\n\n");
       if (KdDebugState & KD_DEBUG_MDA)
 	    PrintString("\n   MDA debugging enabled\n\n");
@@ -374,7 +374,7 @@ KdpPrintString(PANSI_STRING String)
 	if (KdDebugState & KD_DEBUG_BOCHS)
 		KdBochsDebugPrint(pch);
 
-	if (KdDebugState & KD_DEBUG_BOOTLOG)
+	if (KdDebugState & KD_DEBUG_FILELOG)
 		DebugLogWrite(pch);
 
 	if (KdDebugState & KD_DEBUG_MDA)
diff --git a/reactos/ntoskrnl/ke/main.c b/reactos/ntoskrnl/ke/main.c
index 4893d1ef798..4786dad6048 100644
--- a/reactos/ntoskrnl/ke/main.c
+++ b/reactos/ntoskrnl/ke/main.c
@@ -705,7 +705,7 @@ ExpInitializeExecutive(VOID)
 
   /* On the assumption that we can now access disks start up the debug
    * logger thread */
-  if ((KdDebuggerEnabled == TRUE) && (KdDebugState & KD_DEBUG_BOOTLOG))
+  if ((KdDebuggerEnabled == TRUE) && (KdDebugState & KD_DEBUG_FILELOG))
     {
       DebugLogInit2();
     }