[ros-diffs] [navaraf] 13948: Steven Edwards <[e-mail]>

Steven Edwards <steven_ed4153(a)yahoo.com>
Revert incorrect change - KD_DEBUG_BOOTLOG => KD_DEBUG_FILELOG,
/DEBUGPORT=BOOTLOG => /DEBUGPORT=FILE.
Modified: trunk/reactos/ntoskrnl/include/internal/kd.h
Modified: trunk/reactos/ntoskrnl/kd/dlog.c
Modified: trunk/reactos/ntoskrnl/kd/kdebug.c
Modified: trunk/reactos/ntoskrnl/ke/main.c
  _____  

Modified: trunk/reactos/ntoskrnl/include/internal/kd.h
--- trunk/reactos/ntoskrnl/include/internal/kd.h	2005-03-12
00:54:06 UTC (rev 13947)
+++ trunk/reactos/ntoskrnl/include/internal/kd.h	2005-03-12
01:11:06 UTC (rev 13948)
@@ -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
  _____  

Modified: trunk/reactos/ntoskrnl/kd/dlog.c
--- trunk/reactos/ntoskrnl/kd/dlog.c	2005-03-12 00:54:06 UTC (rev
13947)
+++ trunk/reactos/ntoskrnl/kd/dlog.c	2005-03-12 01:11:06 UTC (rev
13948)
@@ -36,11 +36,11 @@

   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
  _____  

Modified: trunk/reactos/ntoskrnl/kd/kdebug.c
--- trunk/reactos/ntoskrnl/kd/kdebug.c	2005-03-12 00:54:06 UTC (rev
13947)
+++ trunk/reactos/ntoskrnl/kd/kdebug.c	2005-03-12 01:11:06 UTC (rev
13948)
@@ -1,4 +1,4 @@

-/* $Id:$
+/* $Id$
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -151,15 +151,15 @@
 		  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 @@
       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 @@
 	    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 @@
 	if (KdDebugState & KD_DEBUG_BOCHS)
 		KdBochsDebugPrint(pch);
 
-	if (KdDebugState & KD_DEBUG_BOOTLOG)
+	if (KdDebugState & KD_DEBUG_FILELOG)
 		DebugLogWrite(pch);
 
 	if (KdDebugState & KD_DEBUG_MDA)
  _____  

Modified: trunk/reactos/ntoskrnl/ke/main.c
--- trunk/reactos/ntoskrnl/ke/main.c	2005-03-12 00:54:06 UTC (rev
13947)
+++ trunk/reactos/ntoskrnl/ke/main.c	2005-03-12 01:11:06 UTC (rev
13948)
@@ -705,7 +705,7 @@

 
   /* 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();
     }