Have Msp430 USCI SpiPacket send op abort if it sees peripheral UCSWRST.

[tinyos-2.x.git] / tos / chips / msp430 / usci / Msp430SpiP.nc

diff --git a/tos/chips/msp430/usci/Msp430SpiP.nc b/tos/chips/msp430/usci/Msp430SpiP.nc
index e446431242a6f77739c05d7df499c7e24f9041bc..8e9100a9e9e59db37bae7fe02d3232ba998510bc 100644 (file)
--- a/tos/chips/msp430/usci/Msp430SpiP.nc
+++ b/tos/chips/msp430/usci/Msp430SpiP.nc
@@ -182,7 +182,7 @@ implementation {
        end = m_len;
       call Registers.setTxbuf((m_txBuf) ? m_txBuf[m_pos] : 0);
       while (++m_pos < end) {
-       while (!call Registers.getIfgRx());
+       while (!call Registers.getIfgTx() && !call Registers.getCtl1(UCSWRST));
        if (m_rxBuf)
          m_rxBuf[m_pos - 1] = call Registers.getRxbuf();
        else