uint8_t m_pins;
uint8_t* m_sobuf; /* Original buffer ptr from UartStream.send() */
- uint8_t m_solen; /* Original buffer len from UartStream.send() */
+ uint16_t m_solen; /* Original buffer len from UartStream.send() */
uint8_t* m_sbuf; /* Position of next char to send */
- uint8_t m_slen; /* Len of chars in m_sbuf to send */
+ uint16_t m_slen; /* Len of chars in m_sbuf to send */
bool m_rxie; /* Set if rxie has been enabled to UartStream.receive() */
uint8_t* m_robuf; /* Original receive buffer */
- uint8_t m_rolen; /* Original (maximum) receive len */
+ uint16_t m_rolen; /* Original (maximum) receive len */
uint8_t* m_rbuf; /* Position of next byte in which to receive a char */
- uint8_t m_rlen; /* Remaining length in receive buffer */
+ uint16_t m_rlen; /* Remaining length in receive buffer */
sfrb(MYBRX, 219U);
call Registers.clrIeRx();
call Registers.clrIeTx();
call Registers.clrIfgRx();
- call Registers.clrIfgTx();
/* Restore pins to their pre-configure state */
if (m_pins & PINS_RXD)
return FAIL;
m_sobuf = buf;
m_solen = len;
+ while (!call Registers.getIfgTx());
call Registers.setIeTx();
call Registers.setTxbuf(*m_sobuf);
m_slen = m_solen - 1;
async event void Interrupts.tx()
{
+ /* 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 (m_slen && call Registers.getIfgTx()) {
call Registers.setTxbuf(*m_sbuf);
if (--m_slen)
}
if (m_slen == 0 && m_sobuf) {
call Registers.clrIeTx();
- call Registers.clrIfgTx();
m_sobuf = 0;
signal UartStream.sendDone(m_sobuf, m_solen, SUCCESS);
}
async event void Interrupts.rx(uint8_t byte)
{
- atomic {
- if (m_robuf) {
- /* receive() takes precedence if active */
- while (m_rlen && call Registers.getIfgRx()) {
- *m_rbuf = byte;
- if (--m_rlen)
- m_rbuf++;
- }
- if (m_rlen == 0 && m_robuf) {
- if (m_rxie) {
- call Registers.clrIeRx();
- call Registers.clrIfgRx();
- }
- m_robuf = 0;
- signal UartStream.receiveDone(m_robuf, m_rolen, SUCCESS);
+ if (m_robuf) {
+ /* receive() takes precedence if active */
+ /* FIXME: an arbitrarily long ISR may occur if m_rlen is large.
+ * But depending on timing, we may always only read 1 byte.
+ */
+ while (m_rlen && call Registers.getIfgRx()) {
+ *m_rbuf = byte;
+ if (--m_rlen)
+ m_rbuf++;
+ }
+ if (m_rlen == 0 && m_robuf) {
+ if (m_rxie) {
+ call Registers.clrIeRx();
+ call Registers.clrIfgRx();
}
- } else
- signal UartStream.receivedByte(byte);
- }
+ m_robuf = 0;
+ signal UartStream.receiveDone(m_robuf, m_rolen, SUCCESS);
+ }
+ } else
+ signal UartStream.receivedByte(byte);
}
default async command const msp430_usci_uart_t* Configure.get()