From: andreaskoepke <andreaskoepke>
Date: Mon, 23 Mar 2009 11:28:02 +0000 (+0000)
Subject: correct reception of packets that require an ACK, patch provided by Roman Lim
X-Git-Tag: rc_6_tinyos_2_1_1~449
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=dd2eec28b5c692a5319c6e7feb14a67e716f2406

correct reception of packets that require an ACK, patch provided by Roman Lim
---

diff --git a/support/sdk/cpp/sf/serialcomm.cpp b/support/sdk/cpp/sf/serialcomm.cpp
index 3c1db5da..ff6901e9 100644
--- a/support/sdk/cpp/sf/serialcomm.cpp
+++ b/support/sdk/cpp/sf/serialcomm.cpp
@@ -442,9 +442,11 @@ bool SerialComm::readPacket(SFPacket &pPacket)
                         case SF_ACK:
                             break;
                         case SF_PACKET_NO_ACK:
-                        case SF_PACKET_ACK:
                             pPacket.setPayload((char *)(&buffer[payloadOffset]-1), count+1+1 - serialHeaderBytes);
                             break;
+                        case SF_PACKET_ACK:
+                            pPacket.setPayload((char *)(&buffer[payloadOffset]), count+1 - serialHeaderBytes);
+                            break;
                         default:
                             DEBUG("SerialComm::readPacket : unknown packet type = " \
                                   << static_cast<uint16_t>(buffer[typeOffset] & 0xff));