[ros-diffs] [tkreuzer] 43690: revert the KD_CONTEXT change

Author: tkreuzer
Date: Thu Oct 22 17:25:37 2009
New Revision: 43690

URL: http://svn.reactos.org/svn/reactos?rev=43690&view=rev
Log:
revert the KD_CONTEXT change

Modified:
    trunk/reactos/drivers/base/kddll/kddll.c
    trunk/reactos/include/reactos/windbgkd.h
    trunk/reactos/ntoskrnl/kd64/kdinit.c
    trunk/reactos/ntoskrnl/kd64/kdlock.c

Modified: trunk/reactos/drivers/base/kddll/kddll.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kddll.c…
==============================================================================
--- trunk/reactos/drivers/base/kddll/kddll.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/base/kddll/kddll.c [iso-8859-1] Thu Oct 22 17:25:37 2009
@@ -139,7 +139,7 @@
             /* Check if we got a breakin  */
             if (KdStatus == KDP_PACKET_RESEND)
             {
-                KdContext->BreakInRequested = TRUE;
+                KdContext->KdpControlCPending = TRUE;
             }
             return KdStatus;
         }

Modified: trunk/reactos/include/reactos/windbgkd.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/windbgkd.h…
==============================================================================
--- trunk/reactos/include/reactos/windbgkd.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/windbgkd.h [iso-8859-1] Thu Oct 22 17:25:37 2009
@@ -211,8 +211,8 @@
 //
 typedef struct _KD_CONTEXT
 {
-    ULONG RetryCount;
-    BOOLEAN BreakInRequested;
+    ULONG KdpDefaultRetries;
+    BOOLEAN KdpControlCPending;
 } KD_CONTEXT, *PKD_CONTEXT;
 
 //

Modified: trunk/reactos/ntoskrnl/kd64/kdinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdinit.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] Thu Oct 22 17:25:37 2009
@@ -284,7 +284,7 @@
         if (!KdpDebuggerStructuresInitialized)
         {
             /* Set the Debug Switch Routine and Retries*/
-            KdpContext.RetryCount = 20;
+            KdpContext.KdpDefaultRetries = 20;
             KiDebugSwitchRoutine = KdpSwitchProcessor;
 
             /* Initialize the Time Slip DPC */

Modified: trunk/reactos/ntoskrnl/kd64/kdlock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdlock.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/kd64/kdlock.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kd64/kdlock.c [iso-8859-1] Thu Oct 22 17:25:37 2009
@@ -40,11 +40,11 @@
     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 @@
         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
         {