# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1250090207 18000
# Node ID 4fc57cfafd313273f8fd57e4754b010ce0d0dda3
# Parent  07ffe912a5b1b34f6caf46ee2ff705806f979f91# Parent  33a58f7aa2f42e8567260d90ce02703f41f0ec6f
daily merge

diff -r 07ffe912a5b1 -r 4fc57cfafd31 connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/RealSerialComm.cpp
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/RealSerialComm.cpp	Wed Aug 12 10:13:12 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/RealSerialComm.cpp	Wed Aug 12 10:16:47 2009 -0500
@@ -491,7 +491,7 @@
 			COMMLOGOPEN();
 			COMMLOGS("CRealSerialComm::SendDataToPort WriteFile successful\n");
 			BYTE* ptr = (BYTE*)inData;
-			long numBytes = (inSize > 20) ? 20 : inSize;
+			long numBytes = (inSize > 80) ? 80 : inSize;
 			char msg[200];
 			sprintf(msg, "CRealSerialComm::SendDataToPort = ");
 			for (int i = 0; i < numBytes; i++)
@@ -778,7 +778,12 @@
 				}
 				else
 				{
-					done = true;
+					numberProcessed++;
+					usedLen += fullMessageLength;
+					bytesRemaining -= fullMessageLength;
+					ptr += fullMessageLength;
+					if (bytesRemaining < protocolHeaderLength)
+						done = true;
 				}
 			}
 			DeleteMsg(usedLen);
diff -r 07ffe912a5b1 -r 4fc57cfafd31 connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TcpComm.cpp
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TcpComm.cpp	Wed Aug 12 10:13:12 2009 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TcpComm.cpp	Wed Aug 12 10:16:47 2009 -0500
@@ -533,7 +533,12 @@
 				}
 				else
 				{
-					done = true;
+					numberProcessed++;
+					usedLen += fullMessageLength;
+					bytesRemaining -= fullMessageLength;
+					ptr += fullMessageLength;
+					if (bytesRemaining < protocolHeaderLength)
+						done = true;
 				}
 			}
 			DeleteMsg(usedLen);