Skip to content

Add UART interrupt dispatcher #4745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Add UART interrupt dispatcher #4745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11f9a09
Add UART interrupt dispatcher
unaiur May 13, 2018
73444e9
Merge branch 'master' into master-uart-isr-dispatch
earlephilhower May 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions cores/esp8266/HardwareSerial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,16 @@ class HardwareSerial: public Stream
return uart_has_overrun(_uart);
}

void attachIsr(void (*isr)(void*), void *arg)
{
uart_isr_attach(_uart, isr, arg);
}

void detachIsr()
{
uart_isr_detach(_uart);
}

protected:
int _uart_nr;
uart_t* _uart = nullptr;
Expand Down
75 changes: 61 additions & 14 deletions cores/esp8266/uart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,16 +240,70 @@ uart_resize_rx_buffer(uart_t* uart, size_t new_size)
return uart->rx_buffer->size;
}

static ets_isr_t s_isr_ptr[2];
static void * s_isr_arg[2];

static void ICACHE_RAM_ATTR
uart_isr_dispatcher(void *unused)
{
(void)unused;
for (int nr = 0; nr < 2; ++nr)
{
if (USIS(nr))
{
if (s_isr_ptr[nr])
{
s_isr_ptr[nr](s_isr_arg[nr]);
}
else
{
USIE(nr) = 0;
USIC(nr) = USIS(nr);
}
}
}
}

void
uart_isr_attach(uart_t* uart, void (*isr)(void*), void *arg)
{
int nr = uart->uart_nr;
ETS_UART_INTR_DISABLE();
if (s_isr_ptr[0] == NULL && s_isr_ptr[1] == NULL)
{
ETS_UART_INTR_ATTACH(uart_isr_dispatcher, NULL);
}
s_isr_ptr[nr] = isr;
s_isr_arg[nr] = arg;
ETS_UART_INTR_ENABLE();
}

void
uart_isr_detach(uart_t* uart)
{
int nr = uart->uart_nr;
ETS_UART_INTR_DISABLE();
s_isr_ptr[nr] = NULL;
s_isr_arg[nr] = NULL;
USIE(nr) = 0;
USIC(nr) = USIS(nr);
if (s_isr_ptr[0] == NULL && s_isr_ptr[1] == NULL)
{
ETS_UART_INTR_ATTACH(NULL, NULL);
}
else
{
ETS_UART_INTR_ENABLE();
}
}

void ICACHE_RAM_ATTR
uart_isr(void * arg)
{
uart_t* uart = (uart_t*)arg;
if(uart == NULL || !uart->rx_enabled)
if(!uart->rx_enabled)
{
USIC(uart->uart_nr) = USIS(uart->uart_nr);
ETS_UART_INTR_DISABLE();
uart_isr_detach(uart);
return;
}
if(USIS(uart->uart_nr) & ((1 << UIFF) | (1 << UITO)))
Expand All @@ -271,21 +325,15 @@ uart_start_isr(uart_t* uart)
USC1(uart->uart_nr) = (100 << UCFFT) | (0x02 << UCTOT) | (1 <<UCTOE );
USIC(uart->uart_nr) = 0xffff;
USIE(uart->uart_nr) = (1 << UIFF) | (1 << UIFR) | (1 << UITO);
ETS_UART_INTR_ATTACH(uart_isr, (void *)uart);
ETS_UART_INTR_ENABLE();
uart_isr_attach(uart, uart_isr, uart);
}

static void
uart_stop_isr(uart_t* uart)
{
if(uart == NULL || !uart->rx_enabled)
return;

ETS_UART_INTR_DISABLE();
USC1(uart->uart_nr) = 0;
USIC(uart->uart_nr) = 0xffff;
USIE(uart->uart_nr) = 0;
ETS_UART_INTR_ATTACH(NULL, NULL);
uart_isr_detach(uart);
if(uart->rx_enabled)
USC1(uart->uart_nr) = 0;
}


Expand Down Expand Up @@ -527,7 +575,6 @@ uart_uninit(uart_t* uart)

if(uart->rx_enabled)
{
uart_stop_isr(uart);
free(uart->rx_buffer->buffer);
free(uart->rx_buffer);
}
Expand Down
3 changes: 3 additions & 0 deletions cores/esp8266/uart.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ bool uart_rx_enabled(uart_t* uart);
void uart_set_baudrate(uart_t* uart, int baud_rate);
int uart_get_baudrate(uart_t* uart);

void uart_isr_attach(uart_t* uart, void (*isr)(void*), void *arg);
void uart_isr_detach(uart_t* uart);

size_t uart_resize_rx_buffer(uart_t* uart, size_t new_size);

size_t uart_write_char(uart_t* uart, char c);
Expand Down