riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sys: uart_stdio: use thread-safe ringbuffer

Browse Source
This commit is contained in:
Kaspar Schleiser 2015-09-24 21:51:23 +02:00
parent 185f63f768
commit aa321eb3f0
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.dep
View File

@ -287,6 +287,10 @@ ifneq (,$(filter posix_sockets,$(USEMODULE)))
USEMODULE += random USEMODULE += random
endif endif
ifneq (,$(filter uart_stdio,$(USEMODULE)))
USEMODULE += tsrb
endif
ifneq (,$(filter posix,$(USEMODULE))) ifneq (,$(filter posix,$(USEMODULE)))
USEMODULE += timex USEMODULE += timex
USEMODULE += vtimer USEMODULE += vtimer

15
sys/uart_stdio/uart_stdio.c
View File

@ -26,7 +26,7 @@
#include <stdio.h> #include <stdio.h>
#include "cpu_conf.h" #include "cpu_conf.h"
#include "ringbuffer.h" #include "tsrb.h"
#include "thread.h" #include "thread.h"
#include "mutex.h" #include "mutex.h"
#include "irq.h" #include "irq.h"
@ -56,7 +56,7 @@
*/ */
static mutex_t _rx_mutex = MUTEX_INIT; static mutex_t _rx_mutex = MUTEX_INIT;
static char _rx_buf_mem[STDIO_RX_BUFSIZE]; static char _rx_buf_mem[STDIO_RX_BUFSIZE];
static ringbuffer_t _rx_buf; static tsrb_t _rx_buf = TSRB_INIT(_rx_buf_mem);
/** /**
* @brief Receive a new character from the UART and put it into the receive buffer * @brief Receive a new character from the UART and put it into the receive buffer
@ -64,25 +64,22 @@ static ringbuffer_t _rx_buf;
void uart_stdio_rx_cb(void *arg, char data) void uart_stdio_rx_cb(void *arg, char data)
{ {
(void)arg; (void)arg;
ringbuffer_add_one(&_rx_buf, data); tsrb_add_one(&_rx_buf, data);
mutex_unlock(&_rx_mutex); mutex_unlock(&_rx_mutex);
} }
void uart_stdio_init(void) void uart_stdio_init(void)
{ {
mutex_lock(&_rx_mutex); mutex_lock(&_rx_mutex);
ringbuffer_init(&_rx_buf, _rx_buf_mem, STDIO_RX_BUFSIZE);
uart_init(STDIO, STDIO_BAUDRATE, uart_stdio_rx_cb, 0, 0); uart_init(STDIO, STDIO_BAUDRATE, uart_stdio_rx_cb, 0, 0);
} }
int uart_stdio_read(char* buffer, int count) int uart_stdio_read(char* buffer, int count)
{ {
int res; int res;
mutex_lock(&_rx_mutex); while (!(res = tsrb_get(&_rx_buf, buffer, count))) {
unsigned state = disableIRQ(); mutex_lock(&_rx_mutex);
count = (count < _rx_buf.avail) ? count : _rx_buf.avail; }
res = ringbuffer_get(&_rx_buf, (char*)buffer, count);
restoreIRQ(state);
return res; return res;
} }