michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: uart_nrfx_uarte: Fix double Rx buffer releasing

Browse source 
Fixes a case for the asynchronous UART API where
only single buffer was attached to the UART, after
filling this buffer release event was trigger first
time and after disabling UART the release event was
triggered again for the same buffer.

Signed-off-by: Kamil Gawor <Kamil.Gawor@nordicsemi.no>
This commit is contained in:
Kamil Gawor 2022-03-24 11:19:11 +01:00 • committed by Carles Cufí
commit ba6d9139bb
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/serial/uart_nrfx_uarte.c
View file

@ -856,8 +856,7 @@ static void notify_uart_rx_rdy(const struct device *dev, size_t len)
user_callback(dev, &evt);
}
static void notify_rx_buf_release(const struct device *dev,
uint8_t **buf, bool clear)
static void rx_buf_release(const struct device *dev, uint8_t **buf)
{
if (*buf) {
struct uart_event evt = {
@ -866,9 +865,7 @@ static void notify_rx_buf_release(const struct device *dev,
};
user_callback(dev, &evt);
if (clear) {
*buf = NULL;
}
*buf = NULL;
}
}
@ -929,8 +926,7 @@ static int uarte_nrfx_rx_enable(const struct device *dev, uint8_t *buf,
if (!len) {
data->async->rx_flush_cnt -= cpy_len;
notify_uart_rx_rdy(dev, cpy_len);
notify_rx_buf_release(dev, &data->async->rx_buf,
true);
rx_buf_release(dev, &data->async->rx_buf);
notify_rx_disable(dev);
return 0;
}
@ -1196,7 +1192,7 @@ static void endrx_isr(const struct device *dev)
return;
}
notify_rx_buf_release(dev, &data->async->rx_buf, false);
rx_buf_release(dev, &data->async->rx_buf);
/* If there is a next buffer, then STARTRX will have already been
* invoked by the short (the next buffer will be filling up already)
@ -1329,8 +1325,8 @@ static void rxto_isr(const struct device *dev)
const struct uarte_nrfx_config *config = dev->config;
struct uarte_nrfx_data *data = dev->data;
notify_rx_buf_release(dev, &data->async->rx_buf, true);
notify_rx_buf_release(dev, &data->async->rx_next_buf, true);
rx_buf_release(dev, &data->async->rx_buf);
rx_buf_release(dev, &data->async->rx_next_buf);
/* If the rx_enabled flag is still set at this point, it means that
* RX is being disabled because all provided RX buffers have been