Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cpu/nrf5x_common: fix uart_poweroff() #19926

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cpu/nrf5x_common: fix uart_poweroff() #19926

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 30 additions & 6 deletions cpu/nrf5x_common/periph/uart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
* @}
*/

#include <assert.h>
#include <stdint.h>
#include <string.h>

Expand Down Expand Up @@ -99,6 +100,28 @@ enum {
UART_ISR_NUMOF,
};

static inline void set_power(uart_t uart, bool value)
{
UART_TYPE *dev = uart_config[uart].dev;

if (value) {
dev->ENABLE = ENABLE_ON;
}
else {
dev->ENABLE = ENABLE_OFF;
}

#ifndef UARTE_PRESENT
dev->POWER = value;
#endif
}

static inline bool get_power(uart_t uart)
{
UART_TYPE *dev = uart_config[uart].dev;
return dev->ENABLE != ENABLE_OFF;
}

int uart_init(uart_t uart, uint32_t baudrate, uart_rx_cb_t rx_cb, void *arg)
{
/* ensure the ISR names have been defined as needed */
Expand All @@ -115,11 +138,6 @@ int uart_init(uart_t uart, uint32_t baudrate, uart_rx_cb_t rx_cb, void *arg)
isr_ctx[uart].rx_cb = rx_cb;
isr_ctx[uart].arg = arg;

#ifndef UARTE_PRESENT
/* only the legacy non-EasyDMA UART needs to be powered on explicitly */
dev->POWER = 1;
#endif

/* reset configuration registers */
dev->CONFIG = 0;

Expand Down Expand Up @@ -206,7 +224,7 @@ int uart_init(uart_t uart, uint32_t baudrate, uart_rx_cb_t rx_cb, void *arg)
}

/* enable the UART device */
dev->ENABLE = ENABLE_ON;
set_power(uart, true);

#ifdef MODULE_PERIPH_UART_NONBLOCKING
/* set up the TX buffer */
Expand Down Expand Up @@ -242,6 +260,7 @@ void uart_poweron(uart_t uart)

if (isr_ctx[uart].rx_cb) {
uart_config[uart].dev->TASKS_STARTRX = 1;
set_power(uart, true);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So if only tx is configured the UART stays powered down?

}
}

Expand All @@ -250,6 +269,7 @@ void uart_poweroff(uart_t uart)
assume((unsigned)uart < UART_NUMOF);

uart_config[uart].dev->TASKS_STOPRX = 1;
set_power(uart, false);
}

/* Unify macro names across nRF51 (UART) and nRF52 and newer (UARTE) */
Expand Down Expand Up @@ -335,6 +355,10 @@ static void _write_buf(uart_t uart, const uint8_t *data, size_t len)
void uart_write(uart_t uart, const uint8_t *data, size_t len)
{
assume((unsigned)uart < UART_NUMOF);
if (!get_power(uart)) {
/* Device is powered down. Writing anyway would deadlock */
return;
}
#ifdef MODULE_PERIPH_UART_NONBLOCKING
for (size_t i = 0; i < len; i++) {
/* in IRQ or interrupts disabled */
Expand Down
Loading