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

Merge pull request #11634 from miri64/tsrb/fix/change-api-types

Browse Source 
tsrb: change input type to `uint8_t`
This commit is contained in:
Kaspar Schleiser 2019-06-05 17:50:16 +02:00 committed by GitHub
commit 9b47dcb542
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ethos/ethos.c
View File

@ -60,7 +60,7 @@ void ethos_setup(ethos_t *dev, const ethos_params_t *params)
dev->last_framesize = 0;
dev->accept_new = true;
tsrb_init(&dev->inbuf, (char*)params->buf, params->bufsize);
tsrb_init(&dev->inbuf, params->buf, params->bufsize);
mutex_init(&dev->out_mutex);
uint32_t a = random_uint32();
@ -127,7 +127,7 @@ static void _end_of_frame(ethos_t *dev)
/* fall through */
case ETHOS_FRAME_TYPE_HELLO_REPLY:
if (dev->framesize == 6) {
tsrb_get(&dev->inbuf, (char*)dev->remote_mac_addr, 6);
tsrb_get(&dev->inbuf, dev->remote_mac_addr, 6);
}
break;
}

2
drivers/slipdev/slipdev.c
View File

@ -44,7 +44,7 @@ static int _init(netdev_t *netdev)
DEBUG("slipdev: initializing device %p on UART %i with baudrate %" PRIu32 "\n",
(void *)dev, dev->config.uart, dev->config.baudrate);
/* initialize buffers */
tsrb_init(&dev->inbuf, dev->rxmem, sizeof(dev->rxmem));
tsrb_init(&dev->inbuf, (uint8_t *)dev->rxmem, sizeof(dev->rxmem));
if (uart_init(dev->config.uart, dev->config.baudrate, _slip_rx_cb,
dev) != UART_OK) {
LOG_ERROR("slipdev: error initializing UART %i with baudrate %" PRIu32 "\n",

3
sys/include/isrpipe.h
View File

@ -42,7 +42,8 @@ typedef struct {
/**
* @brief Static initializer for irspipe
*/
#define ISRPIPE_INIT(tsrb_buf) { .mutex = MUTEX_INIT, .tsrb = TSRB_INIT(tsrb_buf) }
#define ISRPIPE_INIT(tsrb_buf) { .mutex = MUTEX_INIT, \
.tsrb = TSRB_INIT(tsrb_buf) }
/**
* @brief Initialisation function for isrpipe

15
sys/include/tsrb.h
View File

@ -28,6 +28,7 @@
#include <assert.h>
#include <stddef.h>
#include <stdint.h>
#ifdef __cplusplus
extern "C" {
@ -37,7 +38,7 @@ extern "C" {
* @brief thread-safe ringbuffer struct
*/
typedef struct tsrb {
char *buf; /**< Buffer to operate on. */
uint8_t *buf; /**< Buffer to operate on. */
unsigned int size; /**< Size of buffer, must be power of 2. */
volatile unsigned reads; /**< total number of reads */
volatile unsigned writes; /**< total number of writes */
@ -46,7 +47,9 @@ typedef struct tsrb {
/**
* @brief Static initializer
*/
#define TSRB_INIT(BUF) { (BUF), sizeof (BUF), 0, 0 }
/* XXX remove this implicit cast as soon as possible (requires API change
* to isrpipe)*/
#define TSRB_INIT(BUF) { (uint8_t *)(BUF), sizeof (BUF), 0, 0 }
/**
* @brief Initialize a tsrb.
@ -54,7 +57,7 @@ typedef struct tsrb {
* @param[in] buffer Buffer to use by tsrb.
* @param[in] bufsize `sizeof (buffer)`, must be power of 2.
*/
static inline void tsrb_init(tsrb_t *rb, char *buffer, unsigned bufsize)
static inline void tsrb_init(tsrb_t *rb, uint8_t *buffer, unsigned bufsize)
{
/* make sure bufsize is a power of two.
* http://www.exploringbinary.com/ten-ways-to-check-if-an-integer-is-a-power-of-two-in-c/
@ -125,7 +128,7 @@ int tsrb_get_one(tsrb_t *rb);
* @param[in] n max number of bytes to write to @p dst
* @return nr of bytes written to @p dst
*/
int tsrb_get(tsrb_t *rb, char *dst, size_t n);
int tsrb_get(tsrb_t *rb, uint8_t *dst, size_t n);
/**
* @brief Drop bytes from ringbuffer
@ -142,7 +145,7 @@ int tsrb_drop(tsrb_t *rb, size_t n);
* @return 0 on success
* @return -1 if no space available
*/
int tsrb_add_one(tsrb_t *rb, char c);
int tsrb_add_one(tsrb_t *rb, uint8_t c);
/**
* @brief Add bytes to ringbuffer
@ -151,7 +154,7 @@ int tsrb_add_one(tsrb_t *rb, char c);
* @param[in] n max number of bytes to read from @p src
* @return nr of bytes read from @p src
*/
int tsrb_add(tsrb_t *rb, const char *src, size_t n);
int tsrb_add(tsrb_t *rb, const uint8_t *src, size_t n);
#ifdef __cplusplus
}

4
sys/isrpipe/isrpipe.c
View File

@ -22,7 +22,7 @@
void isrpipe_init(isrpipe_t *isrpipe, char *buf, size_t bufsize)
{
mutex_init(&isrpipe->mutex);
tsrb_init(&isrpipe->tsrb, buf, bufsize);
tsrb_init(&isrpipe->tsrb, (uint8_t *)buf, bufsize);
}
int isrpipe_write_one(isrpipe_t *isrpipe, char c)
@ -41,7 +41,7 @@ int isrpipe_read(isrpipe_t *isrpipe, char *buffer, size_t count)
{
int res;
while (!(res = tsrb_get(&isrpipe->tsrb, buffer, count))) {
while (!(res = tsrb_get(&isrpipe->tsrb, (uint8_t *)buffer, count))) {
mutex_lock(&isrpipe->mutex);
}
return res;

2
sys/isrpipe/read_timeout/read_timeout.c
View File

@ -44,7 +44,7 @@ int isrpipe_read_timeout(isrpipe_t *isrpipe, char *buffer, size_t count, uint32_
xtimer_t timer = { .callback = _cb, .arg = &_timeout };
xtimer_set(&timer, timeout);
while (!(res = tsrb_get(&isrpipe->tsrb, buffer, count))) {
while (!(res = tsrb_get(&isrpipe->tsrb, (uint8_t *)buffer, count))) {
mutex_lock(&isrpipe->mutex);
if (_timeout.flag) {
res = -ETIMEDOUT;

12
sys/tsrb/tsrb.c
View File

@ -19,12 +19,12 @@
#include "tsrb.h"
static void _push(tsrb_t *rb, char c)
static void _push(tsrb_t *rb, uint8_t c)
{
rb->buf[rb->writes++ & (rb->size - 1)] = c;
}
static char _pop(tsrb_t *rb)
static uint8_t _pop(tsrb_t *rb)
{
return rb->buf[rb->reads++ & (rb->size - 1)];
}
@ -32,14 +32,14 @@ static char _pop(tsrb_t *rb)
int tsrb_get_one(tsrb_t *rb)
{
if (!tsrb_empty(rb)) {
return (unsigned char)_pop(rb);
return _pop(rb);
}
else {
return -1;
}
}
int tsrb_get(tsrb_t *rb, char *dst, size_t n)
int tsrb_get(tsrb_t *rb, uint8_t *dst, size_t n)
{
size_t tmp = n;
while (tmp && !tsrb_empty(rb)) {
@ -59,7 +59,7 @@ int tsrb_drop(tsrb_t *rb, size_t n)
return (n - tmp);
}
int tsrb_add_one(tsrb_t *rb, char c)
int tsrb_add_one(tsrb_t *rb, uint8_t c)
{
if (!tsrb_full(rb)) {
_push(rb, c);
@ -70,7 +70,7 @@ int tsrb_add_one(tsrb_t *rb, char c)
}
}
int tsrb_add(tsrb_t *rb, const char *src, size_t n)
int tsrb_add(tsrb_t *rb, const uint8_t *src, size_t n)
{
size_t tmp = n;
while (tmp && !tsrb_full(rb)) {