arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00
Code

optimize uart rx isr and lower fifo full treshold (#2355)

Browse Source
This commit is contained in:
Me No Dev 2016-08-01 12:34:32 +03:00 committed by GitHub
parent 0718188264
commit 8cd331a8ba
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cores/esp8266/uart.c
View File

@ -127,39 +127,21 @@ void ICACHE_RAM_ATTR uart_isr(void * arg)
{ {
uart_t* uart = (uart_t*)arg; uart_t* uart = (uart_t*)arg;
if(uart == NULL || !uart->rx_enabled) { if(uart == NULL || !uart->rx_enabled) {
USIC(uart->uart_nr) = 0xffff; USIC(uart->uart_nr) = USIS(uart->uart_nr);
ETS_UART_INTR_DISABLE(); ETS_UART_INTR_DISABLE();
return; return;
} }
if(USIS(uart->uart_nr) & ((1 << UIFF) | (1 << UITO))){
uint32_t int_status = USIS(uart->uart_nr); while((USS(uart->uart_nr) >> USRXC) & 0x7F){
if(int_status & (1 << UIFR)) {
USIC(uart->uart_nr) = (1 << UIFR);//clear any frame error
}
if(int_status & (1 << UIFF) || int_status & (1 << UITO)){
ETS_UART_INTR_DISABLE();
while(((USS(uart->uart_nr) >> USRXC) & 0x7F) != 0){
uint8_t data = USF(uart->uart_nr); uint8_t data = USF(uart->uart_nr);
size_t nextPos = (uart->rx_buffer->wpos + 1) % uart->rx_buffer->size; size_t nextPos = (uart->rx_buffer->wpos + 1) % uart->rx_buffer->size;
if(nextPos != uart->rx_buffer->rpos) { if(nextPos != uart->rx_buffer->rpos) {
uart->rx_buffer->buffer[uart->rx_buffer->wpos] = data; uart->rx_buffer->buffer[uart->rx_buffer->wpos] = data;
uart->rx_buffer->wpos = nextPos; uart->rx_buffer->wpos = nextPos;
} else {
//rx buffer OverFlow
//maybe stop the loop and try later?
} }
} }
int_status = USIS(uart->uart_nr);
if(int_status & (1 << UIFF)) {
USIC(uart->uart_nr) = (1 << UIFF);//clear any FIFO FULL error
}
if(int_status & (1 << UITO)) {
USIC(uart->uart_nr) = (1 << UITO);//clear any TimeOut error
}
ETS_UART_INTR_ENABLE();
} }
USIC(uart->uart_nr) = USIS(uart->uart_nr);
} }
void uart_start_isr(uart_t* uart) void uart_start_isr(uart_t* uart)