X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fmsp430%2Fusci%2FMsp430SpiP.nc;h=922b7cff2bd79b802af4cc7b3b9802918d9c52f2;hb=e1600138e535f794f66b832dbb028c20b49ac5aa;hp=8e9100a9e9e59db37bae7fe02d3232ba998510bc;hpb=3cc3f59931ef8d959c18ba6327b7dadbafa9b6bd;p=tinyos-2.x.git

diff --git a/tos/chips/msp430/usci/Msp430SpiP.nc b/tos/chips/msp430/usci/Msp430SpiP.nc
index 8e9100a9..922b7cff 100644
--- a/tos/chips/msp430/usci/Msp430SpiP.nc
+++ b/tos/chips/msp430/usci/Msp430SpiP.nc
@@ -180,14 +180,13 @@ implementation {
 
       if (end > m_len)
 	end = m_len;
-      call Registers.setTxbuf((m_txBuf) ? m_txBuf[m_pos] : 0);
+      call Registers.setTxbuf(m_txBuf ? m_txBuf[m_pos] : 0);
       while (++m_pos < end) {
-	while (!call Registers.getIfgTx() && !call Registers.getCtl1(UCSWRST));
+	while (!call Registers.getIfgRx() && !call Registers.getCtl1(UCSWRST));
+	tmp = call Registers.getRxbuf();
 	if (m_rxBuf)
 	  m_rxBuf[m_pos - 1] = call Registers.getRxbuf();
-	else
-	  tmp = call Registers.getRxbuf();
-	call Registers.setTxbuf((m_txBuf) ? m_txBuf[m_pos] : 0);
+	call Registers.setTxbuf(m_txBuf ? m_txBuf[m_pos] : 0);
       }
     }
   }