ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix missing serial object for interrupts 

Save serial objects when setting interrupt requests.
Improve uart interrupt handler.
pull/6364/head
Keyur Hariya 2018-02-02 10:47:48 -06:00 committed by Cruz Monrreal II
parent e1c1e8a128
commit 761dcba376
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
targets/TARGET_Maxim/TARGET_MAX32625/serial_api.c
View File

@ -48,8 +48,8 @@
MXC_F_UART_INTFL_RX_FIFO_OVERFLOW) MXC_F_UART_INTFL_RX_FIFO_OVERFLOW)
// Variables for managing the stdio UART // Variables for managing the stdio UART
int stdio_uart_inited; int stdio_uart_inited = 0;
serial_t stdio_uart; serial_t stdio_uart = {0};
// Variables for interrupt driven // Variables for interrupt driven
static uart_irq_handler irq_handler; static uart_irq_handler irq_handler;
@ -75,12 +75,6 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
obj->index = MXC_UART_GET_IDX(obj->uart); obj->index = MXC_UART_GET_IDX(obj->uart);
obj->fifo = (mxc_uart_fifo_regs_t*)MXC_UART_GET_BASE_FIFO(obj->index); obj->fifo = (mxc_uart_fifo_regs_t*)MXC_UART_GET_BASE_FIFO(obj->index);
// Manage stdio UART
if (uart == STDIO_UART) {
stdio_uart_inited = 1;
memcpy(&stdio_uart, obj, sizeof(serial_t));
}
// Record the pins requested // Record the pins requested
obj->tx = tx; obj->tx = tx;
obj->rx = rx; obj->rx = rx;
@ -111,6 +105,12 @@ void serial_init(serial_t *obj, PinName tx, PinName rx)
obj->cfg.size = UART_DATA_SIZE_8_BITS; obj->cfg.size = UART_DATA_SIZE_8_BITS;
obj->cfg.parity = UART_PARITY_DISABLE; obj->cfg.parity = UART_PARITY_DISABLE;
// Manage stdio UART
if (uart == STDIO_UART) {
stdio_uart_inited = 1;
stdio_uart = *obj;
}
int retval = UART_Init(obj->uart, &obj->cfg, &obj->sys_cfg); int retval = UART_Init(obj->uart, &obj->cfg, &obj->sys_cfg);
MBED_ASSERT(retval == E_NO_ERROR); MBED_ASSERT(retval == E_NO_ERROR);
} }
@ -181,7 +181,16 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
void uart_handler(serial_t *obj) void uart_handler(serial_t *obj)
{ {
if (obj && obj->id) { if (obj && obj->id) {
irq_handler(obj->id, RxIrq); // Check for errors or RX Threshold
if (obj->uart->intfl & (MXC_F_UART_INTFL_RX_FIFO_NOT_EMPTY | UART_ERRORS)) {
irq_handler(obj->id, RxIrq);
obj->uart->intfl = (MXC_F_UART_INTFL_RX_FIFO_NOT_EMPTY | UART_ERRORS);
}
// Check for TX Threshold
if (obj->uart->intfl & MXC_F_UART_INTFL_TX_FIFO_AE) {
irq_handler(obj->id, TxIrq);
obj->uart->intfl = MXC_F_UART_INTFL_TX_FIFO_AE;
}
} }
} }
@ -199,6 +208,9 @@ void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id)
//****************************************************************************** //******************************************************************************
void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable)
{ {
MBED_ASSERT(obj->index < MXC_CFG_UART_INSTANCES);
objs[obj->index] = obj;
switch (obj->index) { switch (obj->index) {
case 0: case 0:
NVIC_SetVector(UART0_IRQn, (uint32_t)uart0_handler); NVIC_SetVector(UART0_IRQn, (uint32_t)uart0_handler);
@ -250,7 +262,7 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable)
//****************************************************************************** //******************************************************************************
int serial_getc(serial_t *obj) int serial_getc(serial_t *obj)
{ {
int c = 0; int c = -1;
if (obj->rx != NC) { if (obj->rx != NC) {
// Wait for data to be available // Wait for data to be available