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

Merge pull request #5907 from bcostm/fix_f0_usart_irq 

STM32F0: fix issue with usarts sharing the same irq vector
pull/5917/merge
Cruz Monrreal 2018-01-26 10:36:55 -06:00 committed by GitHub
parent 9a47f09ea9 7ff1cf52c0
commit dfa55336f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 79 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
targets/TARGET_STM/TARGET_STM32F0/serial_device.c
View File

@ -54,7 +54,6 @@ static uart_irq_handler irq_handler;
static void uart_irq(int id) static void uart_irq(int id)
{ {
UART_HandleTypeDef * huart = &uart_handlers[id]; UART_HandleTypeDef * huart = &uart_handlers[id];
if (serial_irq_ids[id] != 0) { if (serial_irq_ids[id] != 0) {
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_TXE) != RESET) { if (__HAL_UART_GET_FLAG(huart, UART_FLAG_TXE) != RESET) {
if (__HAL_UART_GET_IT(huart, UART_IT_TXE) != RESET) { if (__HAL_UART_GET_IT(huart, UART_IT_TXE) != RESET) {
@ -64,7 +63,7 @@ static void uart_irq(int id)
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_RXNE) != RESET) { if (__HAL_UART_GET_FLAG(huart, UART_FLAG_RXNE) != RESET) {
if (__HAL_UART_GET_IT(huart, UART_IT_RXNE) != RESET) { if (__HAL_UART_GET_IT(huart, UART_IT_RXNE) != RESET) {
irq_handler(serial_irq_ids[id], RxIrq); irq_handler(serial_irq_ids[id], RxIrq);
/* Flag has been cleared when reading the content */ /* Flag has been cleared when reading the content */
} }
} }
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) { if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
@ -87,47 +86,53 @@ static void uart2_irq(void)
} }
#endif #endif
#if defined USART3_BASE // Used for both USART3_4_IRQn and USART3_8_IRQn
static void uart3_irq(void) static void uart3_8_irq(void)
{ {
uart_irq(2); #if defined(TARGET_STM32F091RC)
} #if defined(USART3_BASE)
if (__HAL_GET_PENDING_IT(HAL_ITLINE_USART3) != RESET) {
uart_irq(2);
}
#endif #endif
#if defined(USART4_BASE)
#if defined USART4_BASE if (__HAL_GET_PENDING_IT(HAL_ITLINE_USART4) != RESET) {
static void uart4_irq(void) uart_irq(3);
{ }
uart_irq(3);
}
#endif #endif
#if defined(USART5_BASE)
#if defined USART5_BASE if (__HAL_GET_PENDING_IT(HAL_ITLINE_USART5) != RESET) {
static void uart5_irq(void) uart_irq(4);
{ }
uart_irq(4);
}
#endif #endif
#if defined(USART6_BASE)
#if defined USART6_BASE if (__HAL_GET_PENDING_IT(HAL_ITLINE_USART6) != RESET) {
static void uart6_irq(void) uart_irq(5);
{ }
uart_irq(5);
}
#endif #endif
#if defined(USART7_BASE)
#if defined USART7_BASE if (__HAL_GET_PENDING_IT(HAL_ITLINE_USART7) != RESET) {
static void uart7_irq(void) uart_irq(6);
{ }
uart_irq(6);
}
#endif #endif
#if defined(USART8_BASE)
#if defined USART8_BASE if (__HAL_GET_PENDING_IT(HAL_ITLINE_USART8) != RESET) {
static void uart8_irq(void) uart_irq(7);
{ }
uart_irq(7);
}
#endif #endif
#else // TARGET_STM32F070RB, TARGET_STM32F072RB
#if defined(USART3_BASE)
if (USART3->ISR & (UART_FLAG_TXE | UART_FLAG_RXNE | UART_FLAG_ORE)) {
uart_irq(2);
}
#endif
#if defined(USART4_BASE)
if (USART4->ISR & (UART_FLAG_TXE | UART_FLAG_RXNE | UART_FLAG_ORE)) {
uart_irq(3);
}
#endif
#endif
}
void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id) void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id)
{ {
@ -156,53 +161,55 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable)
} }
#endif #endif
#if defined (TARGET_STM32F091RC)
if (obj_s->uart == UART_3) {
irq_n = USART3_8_IRQn;
vector = (uint32_t)&uart3_irq;
}
if (obj_s->uart == UART_4) {
irq_n = USART3_8_IRQn;
vector = (uint32_t)&uart4_irq;
}
if (obj_s->uart == UART_5) {
irq_n = USART3_8_IRQn;
vector = (uint32_t)&uart5_irq;
}
if (obj_s->uart == UART_6) {
irq_n = USART3_8_IRQn;
vector = (uint32_t)&uart6_irq;
}
if (obj_s->uart == UART_7) {
irq_n = USART3_8_IRQn;
vector = (uint32_t)&uart7_irq;
}
if (obj_s->uart == UART_8) {
irq_n = USART3_8_IRQn;
vector = (uint32_t)&uart8_irq;
}
#elif defined (TARGET_STM32F030R8) || defined (TARGET_STM32F051R8)
#else
#if defined(USART3_BASE) #if defined(USART3_BASE)
if (obj_s->uart == UART_3) { if (obj_s->uart == UART_3) {
#if defined(TARGET_STM32F091RC)
irq_n = USART3_8_IRQn;
#else
irq_n = USART3_4_IRQn; irq_n = USART3_4_IRQn;
vector = (uint32_t)&uart3_irq; #endif
vector = (uint32_t)&uart3_8_irq;
} }
#endif #endif
#if defined(USART4_BASE) #if defined(USART4_BASE)
if (obj_s->uart == UART_4) { if (obj_s->uart == UART_4) {
#if defined(TARGET_STM32F091RC)
irq_n = USART3_8_IRQn;
#else
irq_n = USART3_4_IRQn; irq_n = USART3_4_IRQn;
vector = (uint32_t)&uart4_irq; #endif
vector = (uint32_t)&uart3_8_irq;
} }
#endif #endif
// Below usart are available only on TARGET_STM32F091RC
#if defined(USART5_BASE)
if (obj_s->uart == UART_5) {
irq_n = USART3_8_IRQn;
vector = (uint32_t)&uart3_8_irq;
}
#endif
#if defined(USART6_BASE)
if (obj_s->uart == UART_6) {
irq_n = USART3_8_IRQn;
vector = (uint32_t)&uart3_8_irq;
}
#endif
#if defined(USART7_BASE)
if (obj_s->uart == UART_7) {
irq_n = USART3_8_IRQn;
vector = (uint32_t)&uart3_8_irq;
}
#endif
#if defined(USART8_BASE)
if (obj_s->uart == UART_8) {
irq_n = USART3_8_IRQn;
vector = (uint32_t)&uart3_8_irq;
}
#endif #endif
if (enable) { if (enable) {