Commit 443a404

Hsubtnargpennam

authored and

committed

Serial: split uart events TX_COMPLETE from TX_DATA_EMPTY

Use UART_EVEN_TX_COMPLETE to determine when flush() should return

1 parent 04d998d commit 443a404Copy full SHA for 443a404

File tree

2 files changed

+17

-12

lines changed

cores/arduino
- Serial.cpp
- Serial.h

2 files changed

+17

-12

lines changed

`‎cores/arduino/Serial.cpp‎`

Lines changed: 15 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,12 +58,14 @@ void UART::WrapperCallback(uart_callback_args_t *p_args) {`
`58`	`58`	`{`
`59`	`59`	`break;`
`60`	`60`	`}`
`61`		`- case UART_EVENT_TX_COMPLETE:`
`62`		`- case UART_EVENT_TX_DATA_EMPTY:`
	`61`	`+ case UART_EVENT_TX_COMPLETE: // This is call when the transmission is complete`
`63`	`62`	`{`
`64`		`- //uint8_t to_enqueue = uart_ptr->txBuffer.available() < uart_ptr->uart_ctrl.fifo_depth ? uart_ptr->txBuffer.available() : uart_ptr->uart_ctrl.fifo_depth;`
`65`		`- //while (to_enqueue) {`
`66`		`- uart_ptr->tx_done = true;`
	`63`	`+ uart_ptr->tx_complete = true;`
	`64`	`+ break;`
	`65`	`+ }`
	`66`	`+ case UART_EVENT_TX_DATA_EMPTY: // This is called when the buffer is empty`
	`67`	`+ { // Last byte is transmitting, but ready for more data`
	`68`	`+ uart_ptr->tx_empty = true;`
`67`	`69`	`break;`
`68`	`70`	`}`
`69`	`71`	`case UART_EVENT_RX_CHAR:`
`@@ -109,9 +111,10 @@ bool UART::setUpUartIrqs(uart_cfg_t &cfg) {`
`109`	`111`	`size_t UART::write(uint8_t c) {`
`110`	`112`	`/* -------------------------------------------------------------------------- */`
`111`	`113`	`if(init_ok) {`
`112`		`- tx_done = false;`
	`114`	`+ tx_empty = false;`
	`115`	`+ tx_complete = false;`
`113`	`116`	`R_SCI_UART_Write(&uart_ctrl, &c, 1);`
`114`		`- while (!tx_done) {}`
	`117`	`+ while (!tx_empty) {}`
`115`	`118`	`return 1;`
`116`	`119`	`}`
`117`	`120`	`else {`
`@@ -121,9 +124,10 @@ size_t UART::write(uint8_t c) {`
`121`	`124`
`122`	`125`	`size_t UART::write(uint8_t* c, size_t len) {`
`123`	`126`	`if(init_ok) {`
`124`		`- tx_done = false;`
	`127`	`+ tx_empty = false;`
	`128`	`+ tx_complete = false;`
`125`	`129`	`R_SCI_UART_Write(&uart_ctrl, c, len);`
`126`		`- while (!tx_done) {}`
	`130`	`+ while (!tx_empty) {}`
`127`	`131`	`return len;`
`128`	`132`	`}`
`129`	`133`	`else {`
`@@ -322,7 +326,7 @@ int UART::read() {`
`322`	`326`	`/* -------------------------------------------------------------------------- */`
`323`	`327`	`void UART::flush() {`
`324`	`328`	`/* -------------------------------------------------------------------------- */`
`325`		`- while(txBuffer.available());`
	`329`	`+ while(!tx_complete);`
`326`	`330`	`}`
`327`	`331`
`328`	`332`	`/* -------------------------------------------------------------------------- */`
`@@ -335,4 +339,4 @@ size_t UART::write_raw(uint8_t* c, size_t len) {`
`335`	`339`	`i++;`
`336`	`340`	`}`
`337`	`341`	`return len;`
`338`		`-}`
	`342`	`+}`

`‎cores/arduino/Serial.h‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,8 @@ class UART : public arduino::HardwareSerial {`
`78`	`78`	`arduino::SafeRingBufferN<SERIAL_BUFFER_SIZE> rxBuffer;`
`79`	`79`	`arduino::SafeRingBufferN<SERIAL_BUFFER_SIZE> txBuffer;`
`80`	`80`
`81`		`- volatile bool tx_done;`
	`81`	`+ volatile bool tx_empty;`
	`82`	`+ volatile bool tx_complete;`
`82`	`83`
`83`	`84`	`sci_uart_instance_ctrl_t uart_ctrl;`
`84`	`85`	`uart_cfg_t uart_cfg;`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 443a404

File tree

2 files changed

2 files changed

`‎cores/arduino/Serial.cpp‎`

`‎cores/arduino/Serial.h‎`

0 commit comments