From: R. Steve McKown <rsmckown@gmail.com>
Date: Thu, 8 Apr 2010 13:46:32 +0000 (-0600)
Subject: Let UartByte.send() interleave with any in-progress UartStream.send().
X-Git-Tag: debian/2.1.0-4-1tmi~1^2~5
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=9b3bcb092b6b9fba236a452663d71a39189ea283

Let UartByte.send() interleave with any in-progress UartStream.send().
---

diff --git a/tos/chips/msp430/usci/Msp430UartP.nc b/tos/chips/msp430/usci/Msp430UartP.nc
index 6f6384db..dcdc5b38 100644
--- a/tos/chips/msp430/usci/Msp430UartP.nc
+++ b/tos/chips/msp430/usci/Msp430UartP.nc
@@ -134,10 +134,7 @@ implementation {
 
   async command error_t UartByte.send(uint8_t byte)
   {
-    /* FIXME: race with UartStream.send() */
     atomic {
-      if (m_sobuf)
-	return FAIL;
       while (!call Registers.getIfgTx());
       call Registers.setTxbuf(byte);
       return SUCCESS;