RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

cpu/nrf5x_common: fix uart_poweroff()

Browse Source 
Previously, uart_poweroff() and uart_poweron() were no-ops. This
replaces them with the logic to indeed power on and power off the UART
device.

Co-authored-by: crasbe <crasbe@gmail.com>
This commit is contained in:
Marian Buschsieweke 2023-07-05 10:17:28 +02:00 committed by Marian Buschsieweke
parent c636f34eac
commit f20f795d83
No known key found for this signature in database
GPG Key ID: 758BD52517F79C41
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
cpu/nrf5x_common/periph/uart.c
View File

@ -28,6 +28,7 @@
* @} * @}
*/ */
#include <assert.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
@ -99,6 +100,28 @@ enum {
UART_ISR_NUMOF, 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) 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 */ /* ensure the ISR names have been defined as needed */
@ -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].rx_cb = rx_cb;
isr_ctx[uart].arg = arg; 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 */ /* reset configuration registers */
dev->CONFIG = 0; dev->CONFIG = 0;
@ -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 */ /* enable the UART device */
dev->ENABLE = ENABLE_ON; set_power(uart, true);
#ifdef MODULE_PERIPH_UART_NONBLOCKING #ifdef MODULE_PERIPH_UART_NONBLOCKING
/* set up the TX buffer */ /* set up the TX buffer */
@ -242,6 +260,7 @@ void uart_poweron(uart_t uart)
if (isr_ctx[uart].rx_cb) { if (isr_ctx[uart].rx_cb) {
uart_config[uart].dev->TASKS_STARTRX = 1; uart_config[uart].dev->TASKS_STARTRX = 1;
set_power(uart, true);
} }
} }
@ -250,6 +269,7 @@ void uart_poweroff(uart_t uart)
assume((unsigned)uart < UART_NUMOF); assume((unsigned)uart < UART_NUMOF);
uart_config[uart].dev->TASKS_STOPRX = 1; uart_config[uart].dev->TASKS_STOPRX = 1;
set_power(uart, false);
} }
/* Unify macro names across nRF51 (UART) and nRF52 and newer (UARTE) */ /* Unify macro names across nRF51 (UART) and nRF52 and newer (UARTE) */
@ -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) void uart_write(uart_t uart, const uint8_t *data, size_t len)
{ {
assume((unsigned)uart < UART_NUMOF); assume((unsigned)uart < UART_NUMOF);
if (!get_power(uart)) {
/* Device is powered down. Writing anyway would deadlock */
return;
}
#ifdef MODULE_PERIPH_UART_NONBLOCKING #ifdef MODULE_PERIPH_UART_NONBLOCKING
for (size_t i = 0; i < len; i++) { for (size_t i = 0; i < len; i++) {
/* in IRQ or interrupts disabled */ /* in IRQ or interrupts disabled */