From: smckown <smckown@4bc1554a-c7f2-4f65-a403-e0be01f0239c>
Date: Wed, 6 May 2009 14:57:47 +0000 (+0000)
Subject: Msp430SpiP.sendData() reads rxbuf redundantly.
X-Git-Tag: release/2.1.0-1~7
X-Git-Url: https://oss.titaniummirror.com/gitweb?a=commitdiff_plain;h=b3bf0bdc4a86f9ed9caeca0c0f78037f0440b302;p=tinyos-2.x.git

Msp430SpiP.sendData() reads rxbuf redundantly.
---

diff --git a/tos/chips/msp430/usci/Msp430SpiP.nc b/tos/chips/msp430/usci/Msp430SpiP.nc
index e44a0454..12b22932 100644
--- a/tos/chips/msp430/usci/Msp430SpiP.nc
+++ b/tos/chips/msp430/usci/Msp430SpiP.nc
@@ -217,7 +217,7 @@ implementation {
 	while (!call Registers.getIfgRx() && !call Registers.getCtl1(UCSWRST));
 	tmp = call Registers.getRxbuf();
 	if (m_rxBuf)
-	  m_rxBuf[m_pos - 1] = call Registers.getRxbuf();
+	  m_rxBuf[m_pos - 1] = tmp;
 	while (!call Registers.getIfgTx() && !call Registers.getCtl1(UCSWRST));
 	call Registers.setTxbuf(m_txBuf ? m_txBuf[m_pos] : 0);
       }