[UART] Fix serial_[rx|tx]_active functions

fpistm · fpistm · commit 72d8bb6d5dc9 · 2018-06-15T09:08:36.000+02:00
HAL_UART_GetState() return a combined value.
So mask needs to be applied before compare the value.

Signed-off-by: Frederic Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/cores/arduino/stm32/uart.c b/cores/arduino/stm32/uart.c
@@ -633,7 +633,7 @@ size_t uart_debug_write(uint8_t *data, uint32_t size)
  */
 uint8_t serial_rx_active(serial_t *obj)
 {
-  return ((obj == NULL) ? 1 : (HAL_UART_GetState(uart_handlers[obj->index]) == HAL_UART_STATE_BUSY_RX));
+  return ((HAL_UART_GetState(uart_handlers[obj->index]) & HAL_UART_STATE_BUSY_RX) == HAL_UART_STATE_BUSY_RX);
 }
 
 /**
@@ -644,7 +644,7 @@ uint8_t serial_rx_active(serial_t *obj)
  */
 uint8_t serial_tx_active(serial_t *obj)
 {
-  return ((obj == NULL) ? 1 : (HAL_UART_GetState(uart_handlers[obj->index]) == HAL_UART_STATE_BUSY_TX));
+  return ((HAL_UART_GetState(uart_handlers[obj->index]) & HAL_UART_STATE_BUSY_TX) == HAL_UART_STATE_BUSY_TX);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -633,7 +633,7 @@ size_t uart_debug_write(uint8_t *data, uint32_t size)`
`633`	`633`	`*/`
`634`	`634`	`uint8_t serial_rx_active(serial_t *obj)`
`635`	`635`	`{`
`636`		`- return ((obj == NULL) ? 1 : (HAL_UART_GetState(uart_handlers[obj->index]) == HAL_UART_STATE_BUSY_RX));`
	`636`	`+ return ((HAL_UART_GetState(uart_handlers[obj->index]) & HAL_UART_STATE_BUSY_RX) == HAL_UART_STATE_BUSY_RX);`
`637`	`637`	`}`
`638`	`638`
`639`	`639`	`/**`
`@@ -644,7 +644,7 @@ uint8_t serial_rx_active(serial_t *obj)`
`644`	`644`	`*/`
`645`	`645`	`uint8_t serial_tx_active(serial_t *obj)`
`646`	`646`	`{`
`647`		`- return ((obj == NULL) ? 1 : (HAL_UART_GetState(uart_handlers[obj->index]) == HAL_UART_STATE_BUSY_TX));`
	`647`	`+ return ((HAL_UART_GetState(uart_handlers[obj->index]) & HAL_UART_STATE_BUSY_TX) == HAL_UART_STATE_BUSY_TX);`
`648`	`648`	`}`
`649`	`649`
`650`	`650`	`/**`