X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fmsp430%2Fusci%2FMsp430SpiP.nc;fp=tos%2Fchips%2Fmsp430%2Fusci%2FMsp430SpiP.nc;h=142edb7b9f9996a8a15b1ad96a759a2b8b2a8c73;hb=12c6d873092b40119e4d556b3064e94aa21c0bbb;hp=6d8e9f4cea8eb6fa26960f90c17f5dfe4bbbe165;hpb=4845da46c1bc60e3421abf4badf38abd4559a036;p=tinyos-2.x.git

diff --git a/tos/chips/msp430/usci/Msp430SpiP.nc b/tos/chips/msp430/usci/Msp430SpiP.nc
index 6d8e9f4c..142edb7b 100644
--- a/tos/chips/msp430/usci/Msp430SpiP.nc
+++ b/tos/chips/msp430/usci/Msp430SpiP.nc
@@ -229,13 +229,15 @@ implementation {
 
   async command uint8_t SpiByte.write(uint8_t byte)
   {
-    if (isBusy())
-      return 0;
-    else {
-      waitOnTx();
-      call Registers.setTxbuf(byte);
-      waitOnRx();
-      return call Registers.getRxbuf();
+    atomic {
+      if (isBusy())
+	return 0;
+      else {
+	waitOnTx();
+	call Registers.setTxbuf(byte);
+	waitOnRx();
+	return call Registers.getRxbuf();
+      }
     }
   }
 
@@ -248,6 +250,7 @@ implementation {
 
       if (end > m_len)
 	end = m_len;
+      waitOnTx(); /* Don't assume that the last tx is done already */
       call Registers.setTxbuf(m_txBuf ? m_txBuf[m_pos] : 0);
       while (++m_pos < end) {
 	waitOnRx();