* Watch out for sendData() clobbering TXBUF.
* May solve a loss of UART TX chars.
* USCI UartStream.send() gains nothing by immediately sending the 1st byte.
* m_sobuf cannot be null in Interrupts.tx, so remove the check.
if (end > m_len)
end = m_len;
if (end > m_len)
end = m_len;
+ waitOnTx(); /* Don't assume that the last tx is done already */
call Registers.setTxbuf(m_txBuf ? m_txBuf[m_pos] : 0);
while (++m_pos < end) {
waitOnRx();
call Registers.setTxbuf(m_txBuf ? m_txBuf[m_pos] : 0);
while (++m_pos < end) {
waitOnRx();
atomic {
if (m_sobuf || !buf || !len)
return FAIL;
atomic {
if (m_sobuf || !buf || !len)
return FAIL;
- m_sobuf = buf;
- m_solen = len;
- while (!call Registers.getIfgTx());
+ m_sbuf = m_sobuf = buf;
+ m_slen = m_solen = len;
call Registers.setIeTx();
call Registers.setIeTx();
- call Registers.setTxbuf(*m_sobuf);
- m_slen = m_solen - 1;
- if (m_slen)
- m_sbuf = m_sobuf + 1;
/* FIXME: this can cause an arbitrarily long ISR, if m_slen is large.
* But depending on timing, we may always only write 1 byte.
*/
/* FIXME: this can cause an arbitrarily long ISR, if m_slen is large.
* But depending on timing, we may always only write 1 byte.
*/
+ while (!call Registers.getIfgTx()); /* in case interleaved UB.send */
while (m_slen && call Registers.getIfgTx()) {
call Registers.setTxbuf(*m_sbuf);
if (--m_slen)
m_sbuf++;
}
while (m_slen && call Registers.getIfgTx()) {
call Registers.setTxbuf(*m_sbuf);
if (--m_slen)
m_sbuf++;
}
- if (m_slen == 0 && m_sobuf) {
call Registers.clrIeTx();
m_sobuf = 0;
signal UartStream.sendDone(m_sobuf, m_solen, SUCCESS);
call Registers.clrIeTx();
m_sobuf = 0;
signal UartStream.sendDone(m_sobuf, m_solen, SUCCESS);