michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: serial: uart_nrfx_uarte: coexisting async and interrupt API

Browse source 
This commit fixes an issue with the nrfx uarte driver to allow the
async and interrupt driven UART APIs to coexist on different uart
instances. As both APIs cannot be used simultaneously for a given
instance, there is no need to handle
CONFIG_UART_EXCLUSIVE_API_CALLBACKS in this driver.

Signed-off-by: Eivind Jølsgard <eivind.jolsgard@nordicsemi.no>
This commit is contained in:
Eivind Jølsgard 2023-09-20 10:16:50 +02:00 • committed by Fabio Baltieri
commit 66069b3b39
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/serial/uart_nrfx_uarte.c
View file

@ -937,11 +937,6 @@ static int uarte_nrfx_callback_set(const struct device *dev,
data->async->user_callback = callback;
data->async->user_data = user_data;
#if defined(CONFIG_UART_EXCLUSIVE_API_CALLBACKS) && defined(UARTE_INTERRUPT_DRIVEN)
data->int_driven->cb = NULL;
data->int_driven->cb_data = NULL;
#endif
return 0;
}
@ -1680,11 +1675,6 @@ static void uarte_nrfx_irq_callback_set(const struct device *dev,
data->int_driven->cb = cb;
data->int_driven->cb_data = cb_data;
#if defined(UARTE_ANY_ASYNC) && defined(CONFIG_UART_EXCLUSIVE_API_CALLBACKS)
data->async->user_callback = NULL;
data->async->user_data = NULL;
#endif
}
#endif /* UARTE_INTERRUPT_DRIVEN */