From 2abe11c82a856f32c2f1d5878086e3fc5638f30e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 24 Sep 2006 07:38:53 +0000 Subject: [PATCH] Revert r24233, which leads to have the header written too late in debug log and was preventing a crash during the first DbgPrint calls when using GDB Replace it by another fix (not tested) svn path=/trunk/; revision=24245 --- reactos/ntoskrnl/kd/kdinit.c | 1 - reactos/ntoskrnl/kd/kdio.c | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/reactos/ntoskrnl/kd/kdinit.c b/reactos/ntoskrnl/kd/kdinit.c index 52ee7f5992d..0cb5a8688a7 100644 --- a/reactos/ntoskrnl/kd/kdinit.c +++ b/reactos/ntoskrnl/kd/kdinit.c @@ -77,7 +77,6 @@ KdpGetWrapperDebugMode(PCHAR Currentp2, /* Get the KDBG Settings and enable it */ KdDebuggerEnabled = TRUE; KdDebuggerNotPresent = FALSE; - KdpDebugMode.Gdb = TRUE; KdbpGetCommandLineSettings((PCHAR)LoaderBlock->CommandLine); #endif return p2; diff --git a/reactos/ntoskrnl/kd/kdio.c b/reactos/ntoskrnl/kd/kdio.c index e8c638325aa..811d22f7a64 100644 --- a/reactos/ntoskrnl/kd/kdio.c +++ b/reactos/ntoskrnl/kd/kdio.c @@ -188,14 +188,13 @@ KdpSerialInit(PKD_DISPATCH_TABLE DispatchTable, /* Register as a Provider */ InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); + + /* Display separator + ReactOS version at start of the debug log */ + DPRINT1("---------------------------------------------------------------\n"); + DPRINT1("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); } else if (BootPhase == 2) { - /* Display separator + ReactOS version at start of the debug log */ - DbgPrint("---------------------------------------------------------------\n"); - DbgPrint("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); - DbgPrint("---------------------------------------------------------------\n"); - HalDisplayString("\n Serial debugging enabled\n\n"); } }