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

STM32F0: manage better uart3 & 4 irqs 

Manage the case where both uart3 and uart4 interrupts are arriving at the same time.
pull/5907/head
bcostm 2018-01-24 09:52:41 +01:00
parent eaa3e9d2b2
commit 18659ab16b
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,34 +51,27 @@ static uart_irq_handler irq_handler;
* INTERRUPTS HANDLING * INTERRUPTS HANDLING
******************************************************************************/ ******************************************************************************/
static uint32_t uart_irq(int id) static void uart_irq(int id)
{ {
UART_HandleTypeDef * huart = &uart_handlers[id]; UART_HandleTypeDef * huart = &uart_handlers[id];
uint32_t status = 0;
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) {
irq_handler(serial_irq_ids[id], TxIrq); irq_handler(serial_irq_ids[id], TxIrq);
status = 1;
} }
} }
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 */
status = 1;
} }
} }
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) { if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
if (__HAL_UART_GET_IT(huart, UART_IT_ORE) != RESET) { if (__HAL_UART_GET_IT(huart, UART_IT_ORE) != RESET) {
__HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_OREF); __HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_OREF);
status = 1;
} }
} }
} }
return status;
} }
static void uart1_irq(void) static void uart1_irq(void)
@ -128,9 +121,12 @@ static void uart3_8_irq(void)
} }
#endif #endif
#else // TARGET_STM32F070RB, TARGET_STM32F072RB #else // TARGET_STM32F070RB, TARGET_STM32F072RB
if (uart_irq(2) == 0) { // Check if it's USART3 #if defined(USART3_BASE)
uart_irq(3); // Otherwise it's USART4 uart_irq(2);
} #endif
#if defined(USART4_BASE)
uart_irq(3);
#endif
#endif #endif
} }