michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: serial: nrf_uarte: Fix async/int TX api in inactive state

Browse source 
Currently zephyr has no means to control access to the uart
driver when it is inactive, e.g. shell is not aware of uart
being in idle state and calls asynchronous api. Add early
return to TX starting procedure if device is idle.

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2021-05-28 08:06:15 +02:00 • committed by Kumar Gala
commit edff2b020f
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/serial/uart_nrfx_uarte.c
View file

@ -533,10 +533,18 @@ static void uarte_enable(const struct device *dev, uint32_t mask)
nrf_uarte_enable(get_uarte_instance(dev));
}
/* At this point we should have irq locked and any previous transfer completed.
* Transfer can be started, no need to wait for completion.
*/
static void tx_start(const struct device *dev, const uint8_t *buf, size_t len)
{
NRF_UARTE_Type *uarte = get_uarte_instance(dev);
#if CONFIG_PM_DEVICE
if (get_dev_data(dev)->pm_state != PM_DEVICE_STATE_ACTIVE) {
return;
}
#endif
nrf_uarte_tx_buffer_set(uarte, buf, len);
nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_ENDTX);
nrf_uarte_event_clear(uarte, NRF_UARTE_EVENT_TXSTOPPED);
@ -1409,16 +1417,8 @@ static void uarte_nrfx_poll_out(const struct device *dev, unsigned char c)
key = wait_tx_ready(dev);
}
/* At this point we should have irq locked and any previous transfer
* completed. Transfer can be started, no need to wait for completion.
*/
#if CONFIG_PM_DEVICE
if (data->pm_state == PM_DEVICE_STATE_ACTIVE)
#endif
{
data->char_out = c;
tx_start(dev, &data->char_out, 1);
}
data->char_out = c;
tx_start(dev, &data->char_out, 1);
irq_unlock(key);
}