RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

stdio_uart: port to new interface

Browse Source
This commit is contained in:
Benjamin Valentin 2023-06-12 18:19:01 +02:00
parent c1162e4818
commit cce5312be8
2 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/include/stdio_uart.h
View File

@ -111,13 +111,6 @@ extern "C" {
#define STDIO_UART_BAUDRATE (115200) #define STDIO_UART_BAUDRATE (115200)
#endif #endif
#ifndef STDIO_UART_RX_BUFSIZE
/**
* @brief Buffer size for STDIO
*/
#define STDIO_UART_RX_BUFSIZE (64)
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

33
sys/stdio_uart/stdio_uart.c
View File

@ -31,51 +31,33 @@
#include <string.h> #include <string.h>
#include "board.h" #include "board.h"
#include "isrpipe.h"
#include "kernel_defines.h" #include "kernel_defines.h"
#include "periph/uart.h" #include "periph/uart.h"
#include "stdio_base.h"
#include "stdio_uart.h" #include "stdio_uart.h"
#define ENABLE_DEBUG 0 #define ENABLE_DEBUG 0
#include "debug.h" #include "debug.h"
static uint8_t _rx_buf_mem[STDIO_UART_RX_BUFSIZE];
isrpipe_t stdio_uart_isrpipe = ISRPIPE_INIT(_rx_buf_mem);
static void _isrpipe_write_one_wrapper(void *arg, uint8_t value) static void _isrpipe_write_one_wrapper(void *arg, uint8_t value)
{ {
isrpipe_write_one(arg, value); isrpipe_write_one(arg, value);
} }
void stdio_init(void) static void _init(void)
{ {
uart_rx_cb_t cb = NULL; uart_rx_cb_t cb = NULL;
void *arg = NULL; void *arg = NULL;
if (IS_USED(MODULE_STDIO_UART_RX)) { if (IS_USED(MODULE_STDIO_UART_RX)) {
cb = _isrpipe_write_one_wrapper; cb = _isrpipe_write_one_wrapper;
arg = &stdio_uart_isrpipe; arg = &stdin_isrpipe;
} }
uart_init(STDIO_UART_DEV, STDIO_UART_BAUDRATE, cb, arg); uart_init(STDIO_UART_DEV, STDIO_UART_BAUDRATE, cb, arg);
} }
#if IS_USED(MODULE_STDIO_AVAILABLE) static ssize_t _write(const void *buffer, size_t len)
int stdio_available(void)
{
return tsrb_avail(&stdio_uart_isrpipe.tsrb);
}
#endif
ssize_t stdio_read(void* buffer, size_t count)
{
if (IS_USED(MODULE_STDIO_UART_RX)) {
return (ssize_t)isrpipe_read(&stdio_uart_isrpipe, buffer, count);
}
return -ENOTSUP;
}
ssize_t stdio_write(const void *buffer, size_t len)
{ {
ssize_t result = len; ssize_t result = len;
if (IS_USED(MODULE_STDIO_UART_ONLCR)) { if (IS_USED(MODULE_STDIO_UART_ONLCR)) {
@ -101,3 +83,10 @@ ssize_t stdio_write(const void *buffer, size_t len)
} }
return result; return result;
} }
static void _detach(void)
{
uart_poweroff(STDIO_UART_DEV);
}
STDIO_PROVIDER(STDIO_UART, _init, _detach, _write)