Skip to content

STM32L0: fix uart irq index #5917

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

STM32L0: fix uart irq index #5917

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dd77b1
STM32L0: fix uart irq index
Jan 24, 2018
aff5f01
STM32L0: Fixed irq index for all devices by applying the same numberi…
Jan 24, 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
107 changes: 68 additions & 39 deletions targets/TARGET_STM/TARGET_STM32L0/serial_device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,25 +49,58 @@ static uart_irq_handler irq_handler;
* INTERRUPTS HANDLING
******************************************************************************/

static void uart_irq(int id)
static int8_t uart_pointer_get_index(int uart_base)
{
UART_HandleTypeDef * huart = &uart_handlers[id];

if (serial_irq_ids[id] != 0) {
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_TXE) != RESET) {
if (__HAL_UART_GET_IT(huart, UART_IT_TXE) != RESET) {
irq_handler(serial_irq_ids[id], TxIrq);
uint8_t index = 0;
#if defined(USART1_BASE)
if (uart_base == USART1_BASE) return index;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you align the new changes please (see https://docs.mbed.com/docs/mbed-os-handbook/en/latest/cont/code_style/)

index++;
#endif

#if defined(USART2_BASE)
if (uart_base == USART2_BASE) return index;
index++;
#endif

#if defined(USART4_BASE)
if (uart_base == USART4_BASE) return index;
index++;
#endif

#if defined(USART5_BASE)
if (uart_base == USART5_BASE) return index;
index++;
#endif

#if defined(LPUART1_BASE)
if (uart_base == LPUART1_BASE) return index;
index++;
#endif
return -1;
}

static void uart_irq(int uart_base)
{
int8_t id = uart_pointer_get_index(uart_base);
if (id >= 0) {
UART_HandleTypeDef * huart = &uart_handlers[id];

if (serial_irq_ids[id] != 0) {
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_TXE) != RESET) {
if (__HAL_UART_GET_IT(huart, UART_IT_TXE) != RESET) {
irq_handler(serial_irq_ids[id], TxIrq);
}
}
}
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_RXNE) != RESET) {
if (__HAL_UART_GET_IT(huart, UART_IT_RXNE) != RESET) {
irq_handler(serial_irq_ids[id], RxIrq);
/* Flag has been cleared when reading the content */
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_RXNE) != RESET) {
if (__HAL_UART_GET_IT(huart, UART_IT_RXNE) != RESET) {
irq_handler(serial_irq_ids[id], RxIrq);
/* Flag has been cleared when reading the content */
}
}
}
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
if (__HAL_UART_GET_IT(huart, UART_IT_ORE) != RESET) {
__HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_OREF);
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
if (__HAL_UART_GET_IT(huart, UART_IT_ORE) != RESET) {
__HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_OREF);
}
}
}
}
Expand All @@ -76,34 +109,37 @@ static void uart_irq(int id)
#if defined(USART1_BASE)
static void uart1_irq(void)
{
uart_irq(0);
uart_irq(USART1_BASE);
}
#endif

static void uart2_irq(void)
{
uart_irq(1);
uart_irq(USART2_BASE);
}

static void lpuart1_irq(void)
#if defined(USART4_BASE) || defined(USART5_BASE)
static void uart4_5_irq(void)
{
uart_irq(2);
}

#if defined(USART4_BASE)
static void uart4_irq(void)
{
uart_irq(3);
}
if (USART4->ISR & (UART_FLAG_TXE | UART_FLAG_RXNE | UART_FLAG_ORE)) {
uart_irq(USART4_BASE);
}
#endif

#if defined(USART5_BASE)
static void uart5_irq(void)
{
uart_irq(4);
if (USART5->ISR & (UART_FLAG_TXE | UART_FLAG_RXNE | UART_FLAG_ORE)) {
uart_irq(USART5_BASE);
}
#endif
}
#endif

static void lpuart1_irq(void)
{
uart_irq(LPUART1_BASE);
}

void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id)
{
struct serial_s *obj_s = SERIAL_S(obj);
Expand Down Expand Up @@ -136,17 +172,10 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable)
vector = (uint32_t)&lpuart1_irq;
}

#if defined(USART4_BASE)
if (obj_s->uart == UART_4) {
irq_n = USART4_5_IRQn;
vector = (uint32_t)&uart4_irq;
}
#endif

#if defined(USART5_BASE)
if (obj_s->uart == UART_5) {
#if defined(USART4_BASE) || defined(USART5_BASE)
if (obj_s->uart == UART_4 || obj_s->uart == UART_5) {
irq_n = USART4_5_IRQn;
vector = (uint32_t)&uart5_irq;
vector = (uint32_t)&uart4_5_irq;
}
#endif

Expand Down