Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-04 21:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Steven Edwards <steven_ed4153@yahoo.com>

Browse source 
Revert incorrect change - KD_DEBUG_BOOTLOG => KD_DEBUG_FILELOG, /DEBUGPORT=BOOTLOG => /DEBUGPORT=FILE.

svn path=/trunk/; revision=13948
This commit is contained in:
Filip Navara 2005-03-12 01:11:06 +00:00
parent 5bbfa0aa1d
commit 7c7a235e5f
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/ntoskrnl/include/internal/kd.h
View file

@ -16,7 +16,7 @@
#define KD_DEBUG_SCREEN 0x04 #define KD_DEBUG_SCREEN 0x04
#define KD_DEBUG_SERIAL 0x08 #define KD_DEBUG_SERIAL 0x08
#define KD_DEBUG_BOCHS 0x10 #define KD_DEBUG_BOCHS 0x10
#define KD_DEBUG_BOOTLOG 0x20 #define KD_DEBUG_FILELOG 0x20
#define KD_DEBUG_MDA 0x40 #define KD_DEBUG_MDA 0x40
#define KD_DEBUG_KDB 0x80 #define KD_DEBUG_KDB 0x80
#define KD_DEBUG_KDSERIAL 0x100 #define KD_DEBUG_KDSERIAL 0x100

4
reactos/ntoskrnl/kd/dlog.c
View file

@ -36,11 +36,11 @@ DebugLogDumpMessages(VOID)
ULONG Offset; ULONG Offset;
ULONG Length; ULONG Length;
if (!(KdDebugState & KD_DEBUG_BOOTLOG)) if (!(KdDebugState & KD_DEBUG_FILELOG))
{ {
return; return;
} }
KdDebugState &= ~KD_DEBUG_BOOTLOG; KdDebugState &= ~KD_DEBUG_FILELOG;
Offset = (DebugLogEnd + 1) % DEBUGLOG_SIZE; Offset = (DebugLogEnd + 1) % DEBUGLOG_SIZE;
do do

14
reactos/ntoskrnl/kd/kdebug.c
View file

@ -1,4 +1,4 @@
/* $Id:$ /* $Id$
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -151,15 +151,15 @@ KdInitSystem(ULONG BootPhase,
if (Value > 0 && Value < 5) if (Value > 0 && Value < 5)
{ {
KdDebuggerEnabled = TRUE; KdDebuggerEnabled = TRUE;
KdDebugState |= KD_DEBUG_SERIAL; KdDebugState |= KD_DEBUG_SERIAL;
LogPortInfo.ComPort = Value; LogPortInfo.ComPort = Value;
} }
} }
else if (!_strnicmp(p2, "BOOTLOG", 4) && BootPhase > 0) else if (!_strnicmp(p2, "FILE", 4) && BootPhase > 0)
{ {
p2 += 4; p2 += 4;
KdDebuggerEnabled = TRUE; KdDebuggerEnabled = TRUE;
KdDebugState |= KD_DEBUG_BOOTLOG; KdDebugState |= KD_DEBUG_FILELOG;
} }
else if (!_strnicmp(p2, "MDA", 3) && BootPhase > 0) else if (!_strnicmp(p2, "MDA", 3) && BootPhase > 0)
{ {
@ -261,7 +261,7 @@ KdInitSystem(ULONG BootPhase,
if (KdDebugState & KD_DEBUG_SERIAL && BootPhase == 0) if (KdDebugState & KD_DEBUG_SERIAL && BootPhase == 0)
KdPortInitializeEx(&LogPortInfo, 0, 0); KdPortInitializeEx(&LogPortInfo, 0, 0);
if (KdDebugState & KD_DEBUG_BOOTLOG && BootPhase > 0) if (KdDebugState & KD_DEBUG_FILELOG && BootPhase > 0)
DebugLogInit(); DebugLogInit();
if (KdDebugState & KD_DEBUG_MDA && BootPhase > 0) if (KdDebugState & KD_DEBUG_MDA && BootPhase > 0)
@ -317,7 +317,7 @@ KdInit3(VOID)
PrintString("\n Serial debugging enabled. COM%ld %ld Baud\n\n", PrintString("\n Serial debugging enabled. COM%ld %ld Baud\n\n",
LogPortInfo.ComPort, LogPortInfo.BaudRate); LogPortInfo.ComPort, LogPortInfo.BaudRate);
if (KdDebugState & KD_DEBUG_BOOTLOG) if (KdDebugState & KD_DEBUG_FILELOG)
PrintString("\n File log debugging enabled\n\n"); PrintString("\n File log debugging enabled\n\n");
if (KdDebugState & KD_DEBUG_MDA) if (KdDebugState & KD_DEBUG_MDA)
PrintString("\n MDA debugging enabled\n\n"); PrintString("\n MDA debugging enabled\n\n");
@ -374,7 +374,7 @@ KdpPrintString(PANSI_STRING String)
if (KdDebugState & KD_DEBUG_BOCHS) if (KdDebugState & KD_DEBUG_BOCHS)
KdBochsDebugPrint(pch); KdBochsDebugPrint(pch);
if (KdDebugState & KD_DEBUG_BOOTLOG) if (KdDebugState & KD_DEBUG_FILELOG)
DebugLogWrite(pch); DebugLogWrite(pch);
if (KdDebugState & KD_DEBUG_MDA) if (KdDebugState & KD_DEBUG_MDA)

2
reactos/ntoskrnl/ke/main.c
View file

@ -705,7 +705,7 @@ ExpInitializeExecutive(VOID)
/* On the assumption that we can now access disks start up the debug /* On the assumption that we can now access disks start up the debug
* logger thread */ * logger thread */
if ((KdDebuggerEnabled == TRUE) && (KdDebugState & KD_DEBUG_BOOTLOG)) if ((KdDebuggerEnabled == TRUE) && (KdDebugState & KD_DEBUG_FILELOG))
{ {
DebugLogInit2(); DebugLogInit2();
} }