Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / serial / SerialDispatcherP.nc

diff --git a/tos/lib/serial/SerialDispatcherP.nc b/tos/lib/serial/SerialDispatcherP.nc
index 85f13e0718b8445ffe4a0b29b68826d531fcd776..fd2946b19ab33424ad271e944c92bd1980b85825 100644 (file)
--- a/tos/lib/serial/SerialDispatcherP.nc
+++ b/tos/lib/serial/SerialDispatcherP.nc
@@ -186,7 +186,7 @@ implementation {
   }
 
   bool isCurrentBufferLocked() {
-    return (receiveState.which)? receiveState.bufZeroLocked : receiveState.bufOneLocked;
+    return (receiveState.which)? receiveState.bufOneLocked : receiveState.bufZeroLocked;
   }
 
   void lockCurrentBuffer() {
@@ -294,6 +294,9 @@ implementation {
         receiveTaskSize = recvIndex;
         receiveBufferSwap();
         receiveState.state = RECV_STATE_IDLE;
+      } else {
+        // we can't deliver the packet, better free the current buffer.
+        unlockBuffer(receiveState.which);
       }
     }
     if (postsignalreceive){