From e1600138e535f794f66b832dbb028c20b49ac5aa Mon Sep 17 00:00:00 2001 From: smckown Date: Sat, 25 Apr 2009 18:39:02 +0000 Subject: [PATCH] Fix error in last commit; need to check getIfgRx() not getIfgTx(). --- tos/chips/msp430/usci/Msp430SpiP.nc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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); } } } -- 2.39.2