Fix UART writeBuf and flush

me-no-dev · me-no-dev · commit fb4f1333d256 · 2016-10-06T16:31:28.000+03:00
diff --git a/cores/esp32/esp32-hal-uart.c b/cores/esp32/esp32-hal-uart.c
@@ -170,9 +170,11 @@ void uartWrite(uart_t* uart, uint8_t c)
 
 void uartWriteBuf(uart_t* uart, const uint8_t * data, size_t len)
 {
-    while(len && uart->dev->status.rxfifo_cnt < 0x7F) {
-        uart->dev->fifo.rw_byte = *data++;
-        len--;
+    while(len) {
+        while(len && uart->dev->status.txfifo_cnt < 0x7F) {
+            uart->dev->fifo.rw_byte = *data++;
+            len--;
+        }
     }
 }
 
@@ -189,8 +191,8 @@ void uartFlush(uart_t* uart)
     }
 
     if(uart->txEnabled) {
-        tmp |= UART_TXFIFO_RST;
         while(uart->dev->status.txfifo_cnt);
+        tmp |= UART_TXFIFO_RST;
     }
 
     uart->dev->conf0.val |= (tmp);

Original file line number	Diff line number	Diff line change
`@@ -170,9 +170,11 @@ void uartWrite(uart_t* uart, uint8_t c)`
`170`	`170`
`171`	`171`	`void uartWriteBuf(uart_t* uart, const uint8_t * data, size_t len)`
`172`	`172`	`{`
`173`		`- while(len && uart->dev->status.rxfifo_cnt < 0x7F) {`
`174`		`- uart->dev->fifo.rw_byte = *data++;`
`175`		`- len--;`
	`173`	`+ while(len) {`
	`174`	`+ while(len && uart->dev->status.txfifo_cnt < 0x7F) {`
	`175`	`+ uart->dev->fifo.rw_byte = *data++;`
	`176`	`+ len--;`
	`177`	`+ }`
`176`	`178`	`}`
`177`	`179`	`}`
`178`	`180`
`@@ -189,8 +191,8 @@ void uartFlush(uart_t* uart)`
`189`	`191`	`}`
`190`	`192`
`191`	`193`	`if(uart->txEnabled) {`
`192`		`- tmp \|= UART_TXFIFO_RST;`
`193`	`194`	`while(uart->dev->status.txfifo_cnt);`
	`195`	`+ tmp \|= UART_TXFIFO_RST;`
`194`	`196`	`}`
`195`	`197`
`196`	`198`	`uart->dev->conf0.val \|= (tmp);`