From aa43316443a38c97eaf7be7d39c8d9cc24326230 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Thu, 22 Oct 2009 15:25:37 +0000
Subject: [PATCH] revert the KD_CONTEXT change

svn path=/trunk/; revision=43690
---
 reactos/drivers/base/kddll/kddll.c | 2 +-
 reactos/include/reactos/windbgkd.h | 4 ++--
 reactos/ntoskrnl/kd64/kdinit.c     | 2 +-
 reactos/ntoskrnl/kd64/kdlock.c     | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/reactos/drivers/base/kddll/kddll.c b/reactos/drivers/base/kddll/kddll.c
index 4e4c1ebccb1..b86c9055e09 100644
--- a/reactos/drivers/base/kddll/kddll.c
+++ b/reactos/drivers/base/kddll/kddll.c
@@ -139,7 +139,7 @@ KdReceivePacket(
             /* Check if we got a breakin  */
             if (KdStatus == KDP_PACKET_RESEND)
             {
-                KdContext->BreakInRequested = TRUE;
+                KdContext->KdpControlCPending = TRUE;
             }
             return KdStatus;
         }
diff --git a/reactos/include/reactos/windbgkd.h b/reactos/include/reactos/windbgkd.h
index 38c6ae87df8..bc88bf590f1 100644
--- a/reactos/include/reactos/windbgkd.h
+++ b/reactos/include/reactos/windbgkd.h
@@ -211,8 +211,8 @@ typedef struct _KD_PACKET
 //
 typedef struct _KD_CONTEXT
 {
-    ULONG RetryCount;
-    BOOLEAN BreakInRequested;
+    ULONG KdpDefaultRetries;
+    BOOLEAN KdpControlCPending;
 } KD_CONTEXT, *PKD_CONTEXT;
 
 //
diff --git a/reactos/ntoskrnl/kd64/kdinit.c b/reactos/ntoskrnl/kd64/kdinit.c
index 1b1ac485fbf..e5c487c8a3b 100644
--- a/reactos/ntoskrnl/kd64/kdinit.c
+++ b/reactos/ntoskrnl/kd64/kdinit.c
@@ -284,7 +284,7 @@ KdInitSystem(IN ULONG BootPhase,
         if (!KdpDebuggerStructuresInitialized)
         {
             /* Set the Debug Switch Routine and Retries*/
-            KdpContext.RetryCount = 20;
+            KdpContext.KdpDefaultRetries = 20;
             KiDebugSwitchRoutine = KdpSwitchProcessor;
 
             /* Initialize the Time Slip DPC */
diff --git a/reactos/ntoskrnl/kd64/kdlock.c b/reactos/ntoskrnl/kd64/kdlock.c
index 0afbbf61cb1..f332eb1c016 100644
--- a/reactos/ntoskrnl/kd64/kdlock.c
+++ b/reactos/ntoskrnl/kd64/kdlock.c
@@ -40,11 +40,11 @@ KdpPollBreakInWithPortLock(VOID)
     if (KdDebuggerEnabled)
     {
         /* Check if a CTRL-C is in the queue */
-        if (KdpContext.BreakInRequested)
+        if (KdpContext.KdpControlCPending)
         {
             /* Set it and prepare for break */
             DoBreak = TRUE;
-            KdpContext.BreakInRequested = FALSE;
+            KdpContext.KdpControlCPending = FALSE;
         }
         else
         {
@@ -83,12 +83,12 @@ KdPollBreakIn(VOID)
         Enable = KeDisableInterrupts();
 
         /* Check if a CTRL-C is in the queue */
-        if (KdpContext.BreakInRequested)
+        if (KdpContext.KdpControlCPending)
         {
             /* Set it and prepare for break */
             KdpControlCPressed = TRUE;
             DoBreak = TRUE;
-            KdpContext.BreakInRequested = FALSE;
+            KdpContext.KdpControlCPending = FALSE;
         }
         else
         {