Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 1 addition & 6 deletions drivers/at/at.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,12 @@
#define AT_PRINT_INCOMING (0)
#endif

static void _isrpipe_write_one_wrapper(void *_isrpipe, uint8_t data)
{
isrpipe_write_one(_isrpipe, (char)data);
}

int at_dev_init(at_dev_t *dev, uart_t uart, uint32_t baudrate, char *buf, size_t bufsize)
{
dev->uart = uart;
isrpipe_init(&dev->isrpipe, buf, bufsize);

return uart_init(uart, baudrate, _isrpipe_write_one_wrapper,
return uart_init(uart, baudrate, isrpipe_write_uartcb,
&dev->isrpipe);
}

Expand Down
7 changes: 7 additions & 0 deletions sys/include/isrpipe.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ void isrpipe_init(isrpipe_t *isrpipe, char *buf, size_t bufsize);
*/
int isrpipe_write_one(isrpipe_t *isrpipe, char c);

/**
* @brief Wrapper around isrpipe_write_one() to make it compatible with uart_rx_cb_t.
*
* The parameters are the same as isrpipe_write_one().
*/
void isrpipe_write_uartcb(void *_isrpipe, uint8_t data);

/**
* @brief Read data from isrpipe (blocking)
*
Expand Down
6 changes: 6 additions & 0 deletions sys/isrpipe/isrpipe.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* @}
*/

#include <stdint.h>
#include "isrpipe.h"

void isrpipe_init(isrpipe_t *isrpipe, char *buf, size_t bufsize)
Expand All @@ -37,6 +38,11 @@ int isrpipe_write_one(isrpipe_t *isrpipe, char c)
return res;
}

void isrpipe_write_uartcb(void *_isrpipe, uint8_t data)
{
isrpipe_write_one(_isrpipe, (char)data);
}

int isrpipe_read(isrpipe_t *isrpipe, char *buffer, size_t count)
{
int res;
Expand Down
3 changes: 0 additions & 3 deletions sys/stdio_uart/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
ifeq (gnu, $(TOOLCHAIN))
CFLAGS += -Wno-cast-function-type
endif
include $(RIOTBASE)/Makefile.base
2 changes: 1 addition & 1 deletion sys/stdio_uart/stdio_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void stdio_init(void)
void *arg;

#ifdef MODULE_STDIO_UART_RX
cb = (uart_rx_cb_t) isrpipe_write_one;
cb = isrpipe_write_uartcb;
arg = &stdio_uart_isrpipe;
#else
#ifdef USE_ETHOS_FOR_STDIO
Expand Down