From: smckown <smckown@4bc1554a-c7f2-4f65-a403-e0be01f0239c>
Date: Sat, 25 Apr 2009 03:03:26 +0000 (+0000)
Subject: Have Msp430 USCI SpiPacket send op abort if it sees peripheral UCSWRST.
X-Git-Tag: release/2.1.0-1~15
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=3cc3f59931ef8d959c18ba6327b7dadbafa9b6bd

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

diff --git a/tos/chips/msp430/usci/Msp430SpiP.nc b/tos/chips/msp430/usci/Msp430SpiP.nc
index e4464312..8e9100a9 100644
--- 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