[ros-diffs] [tkreuzer] 43763: revert 43682, fix kdcom build

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Mon Oct 26 00:28:26 2009
New Revision: 43763

URL: http://svn.reactos.org/svn/reactos?rev=43763&view=rev
Log:
revert 43682, fix kdcom build

Modified:
    branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c
    branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h
    branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h
    branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdinit.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdlock.c

Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c?rev=43763&r1=43762&r2=43763&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] Mon Oct 26 00:28:26 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: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h?rev=43763&r1=43762&r2=43763&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.h [iso-8859-1] Mon Oct 26 00:28:26 2009
@@ -40,4 +40,46 @@
 #define KDDBGPRINT KdpDbgPrint
 #endif
 
+VOID
+NTAPI
+KdpSendBuffer(
+    IN PVOID Buffer,
+    IN ULONG Size);
+
+KDP_STATUS
+NTAPI
+KdpReceiveBuffer(
+    OUT PVOID Buffer,
+    IN  ULONG Size);
+
+KDP_STATUS
+NTAPI
+KdpReceivePacketLeader(
+    OUT PULONG PacketLeader);
+
+VOID
+NTAPI
+KdpSendByte(IN BYTE Byte);
+
+KDP_STATUS
+NTAPI
+KdpPollByte(OUT PBYTE OutByte);
+
+KDP_STATUS
+NTAPI
+KdpReceiveByte(OUT PBYTE OutByte);
+
+KDP_STATUS
+NTAPI
+KdpPollBreakIn();
+
+
+#if 0
+NTSTATUS
+NTAPI
+KdDebuggerInitialize0(
+    IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL);
+#endif
+
+
 #endif /* !_KDDLL_H_ */

Modified: branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h?rev=43763&r1=43762&r2=43763&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h [iso-8859-1] Mon Oct 26 00:28:26 2009
@@ -220,8 +220,8 @@
 //
 typedef struct _KD_CONTEXT
 {
-    ULONG RetryCount;
-    BOOLEAN BreakInRequested;
+    ULONG KdpDefaultRetries;
+    BOOLEAN KdpControlCPending;
 } KD_CONTEXT, *PKD_CONTEXT;
 
 //

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdinit.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdinit.c?rev=43763&r1=43762&r2=43763&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] Mon Oct 26 00:28:26 2009
@@ -285,7 +285,7 @@
         if (!KdpDebuggerStructuresInitialized)
         {
             /* Set the Debug Switch Routine and Retries*/
-            KdpContext.RetryCount = 20;
+            KdpContext.KdpDefaultRetries = 20;
             KiDebugSwitchRoutine = KdpSwitchProcessor;
 
             /* Initialize the Time Slip DPC */

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdlock.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdlock.c?rev=43763&r1=43762&r2=43763&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdlock.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdlock.c [iso-8859-1] Mon Oct 26 00:28:26 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
         {