[ros-diffs] [tkreuzer] 39133: kdcom: xor 1 to CurrentPacketId when we receive an ACK, not when we send one. Remove the SYNC_PACKET_ID hack. Now breaking in after DbgPrints works.

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Tue Jan 27 13:58:25 CET 2009


Author: tkreuzer
Date: Tue Jan 27 06:58:24 2009
New Revision: 39133

URL: http://svn.reactos.org/svn/reactos?rev=39133&view=rev
Log:
kdcom: xor 1 to CurrentPacketId when we receive an ACK, not when we send one. Remove the SYNC_PACKET_ID hack. Now breaking in after DbgPrints works.

Modified:
    branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c

Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c?rev=39133&r1=39132&r2=39133&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Tue Jan 27 06:58:24 2009
@@ -814,12 +814,6 @@
                                                     MessageData->Length);
         }
 
-        // FIXME: this looks wrong, but makes dbgprints work
-        if (PacketType == PACKET_TYPE_KD_DEBUG_IO)
-        {
-            CurrentPacketId |= SYNC_PACKET_ID;
-        }
-
         /* Set the packet id */
         Packet.PacketId = CurrentPacketId;
 
@@ -967,6 +961,7 @@
                     if (PacketType == PACKET_TYPE_KD_ACKNOWLEDGE)
                     {
                         /* Remote acknowledges the last packet */
+                        CurrentPacketId ^= 1;
                         return KdPacketReceived;
                     }
                     /* That's not what we were waiting for, start over. */
@@ -1091,7 +1086,6 @@
 
         /* Acknowledge the received packet */
         KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE, Packet.PacketId);
-        CurrentPacketId ^= 1;
 
 //FrLdrDbgPrint("KdReceivePacket - all ok\n");
 



More information about the Ros-diffs mailing list