STM32F3: Fix serial IRQ handling

Filip Jagodzinski · Filip Jagodzinski · commit d6a48218eecd · 2019-06-07T15:26:20.000+02:00
Check that the RX or TX interrupt is enabled before calling
a registered handler with RxIrq or TxIrq arg.
diff --git a/targets/TARGET_STM/TARGET_STM32F3/serial_device.c b/targets/TARGET_STM/TARGET_STM32F3/serial_device.c
@@ -58,12 +58,12 @@ static void uart_irq(UARTName uart_name)
         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) {
+                if (__HAL_UART_GET_IT(huart, UART_IT_TXE) != RESET && __HAL_UART_GET_IT_SOURCE(huart, UART_IT_TXE)) {
                     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) {
+                if (__HAL_UART_GET_IT(huart, UART_IT_RXNE) != RESET && __HAL_UART_GET_IT_SOURCE(huart, UART_IT_RXNE)) {
                     irq_handler(serial_irq_ids[id], RxIrq);
                     /*  Flag has been cleared when reading the content */
                 }

Original file line number	Diff line number	Diff line change
`@@ -58,12 +58,12 @@ static void uart_irq(UARTName uart_name)`
`58`	`58`	`UART_HandleTypeDef *huart = &uart_handlers[id];`
`59`	`59`	`if (serial_irq_ids[id] != 0) {`
`60`	`60`	`if (__HAL_UART_GET_FLAG(huart, UART_FLAG_TXE) != RESET) {`
`61`		`- if (__HAL_UART_GET_IT(huart, UART_IT_TXE) != RESET) {`
	`61`	`+ if (__HAL_UART_GET_IT(huart, UART_IT_TXE) != RESET && __HAL_UART_GET_IT_SOURCE(huart, UART_IT_TXE)) {`
`62`	`62`	`irq_handler(serial_irq_ids[id], TxIrq);`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`if (__HAL_UART_GET_FLAG(huart, UART_FLAG_RXNE) != RESET) {`
`66`		`- if (__HAL_UART_GET_IT(huart, UART_IT_RXNE) != RESET) {`
	`66`	`+ if (__HAL_UART_GET_IT(huart, UART_IT_RXNE) != RESET && __HAL_UART_GET_IT_SOURCE(huart, UART_IT_RXNE)) {`
`67`	`67`	`irq_handler(serial_irq_ids[id], RxIrq);`
`68`	`68`	`/* Flag has been cleared when reading the content */`
`69`	`69`	`}`