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

Merge pull request #18774 from maribu/sys/stdio_uart/undef_behavior

Browse Source 
sys/stdio_uart: fix undefined behavior
This commit is contained in:
benpicco 2022-10-24 23:38:10 +02:00 committed by GitHub
commit af84b09dce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/stdio_uart/Makefile
View File

@ -1,4 +1 @@
ifeq (gnu, $(TOOLCHAIN))
CFLAGS += -Wno-cast-function-type
endif
include $(RIOTBASE)/Makefile.base

37
sys/stdio_uart/stdio_uart.c
View File

@ -30,11 +30,11 @@
#include <errno.h>
#include <string.h>
#include "stdio_uart.h"
#include "board.h"
#include "periph/uart.h"
#include "isrpipe.h"
#include "kernel_defines.h"
#include "periph/uart.h"
#include "stdio_uart.h"
#if MODULE_VFS
#include "vfs.h"
@ -43,23 +43,23 @@
#define ENABLE_DEBUG 0
#include "debug.h"
#ifdef MODULE_STDIO_UART_RX
static uint8_t _rx_buf_mem[STDIO_UART_RX_BUFSIZE];
isrpipe_t stdio_uart_isrpipe = ISRPIPE_INIT(_rx_buf_mem);
#endif
static void _isrpipe_write_one_wrapper(void *arg, uint8_t value)
{
isrpipe_write_one(arg, value);
}
void stdio_init(void)
{
uart_rx_cb_t cb;
void *arg;
uart_rx_cb_t cb = NULL;
void *arg = NULL;
#ifdef MODULE_STDIO_UART_RX
cb = (uart_rx_cb_t) isrpipe_write_one;
arg = &stdio_uart_isrpipe;
#else
cb = NULL;
arg = NULL;
#endif
if (IS_USED(MODULE_STDIO_UART_RX)) {
cb = _isrpipe_write_one_wrapper;
arg = &stdio_uart_isrpipe;
}
uart_init(STDIO_UART_DEV, STDIO_UART_BAUDRATE, cb, arg);
@ -77,13 +77,10 @@ int stdio_available(void)
ssize_t stdio_read(void* buffer, size_t count)
{
#ifdef MODULE_STDIO_UART_RX
return (ssize_t)isrpipe_read(&stdio_uart_isrpipe, buffer, count);
#else
(void)buffer;
(void)count;
if (IS_USED(MODULE_STDIO_UART_RX)) {
return (ssize_t)isrpipe_read(&stdio_uart_isrpipe, buffer, count);
}
return -ENOTSUP;
#endif
}
ssize_t stdio_write(const void *buffer, size_t len)