feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Tabs -> spaces

Browse Source
This commit is contained in:
Jeroen Domburg
2016-10-24 21:25:48 +08:00
parent d9005e739d
commit d7ea61734b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/freertos/ringbuf.c
View File

@@ -556,7 +556,7 @@ static void *xRingbufferReceiveGeneric(RingbufHandle_t ringbuf, size_t *item_siz
void *xRingbufferReceive(RingbufHandle_t ringbuf, size_t *item_size, TickType_t ticks_to_wait) void *xRingbufferReceive(RingbufHandle_t ringbuf, size_t *item_size, TickType_t ticks_to_wait)
{ {
return xRingbufferReceiveGeneric(ringbuf, item_size, ticks_to_wait, 0); return xRingbufferReceiveGeneric(ringbuf, item_size, ticks_to_wait, 0);
} }
@@ -573,17 +573,17 @@ void *xRingbufferReceiveFromISR(RingbufHandle_t ringbuf, size_t *item_size)
void *xRingbufferReceiveUpTo(RingbufHandle_t ringbuf, size_t *item_size, TickType_t ticks_to_wait, size_t wanted_size) { void *xRingbufferReceiveUpTo(RingbufHandle_t ringbuf, size_t *item_size, TickType_t ticks_to_wait, size_t wanted_size) {
ringbuf_t *rb=(ringbuf_t *)ringbuf; ringbuf_t *rb=(ringbuf_t *)ringbuf;
if (wanted_size == 0) return NULL; if (wanted_size == 0) return NULL;
configASSERT(rb); configASSERT(rb);
configASSERT(rb->flags & flag_bytebuf); configASSERT(rb->flags & flag_bytebuf);
return xRingbufferReceiveGeneric(ringbuf, item_size, ticks_to_wait, wanted_size); return xRingbufferReceiveGeneric(ringbuf, item_size, ticks_to_wait, wanted_size);
} }
void *xRingbufferReceiveUpToFromISR(RingbufHandle_t ringbuf, size_t *item_size, size_t wanted_size) void *xRingbufferReceiveUpToFromISR(RingbufHandle_t ringbuf, size_t *item_size, size_t wanted_size)
{ {
ringbuf_t *rb=(ringbuf_t *)ringbuf; ringbuf_t *rb=(ringbuf_t *)ringbuf;
uint8_t *itemData; uint8_t *itemData;
if (wanted_size == 0) return NULL; if (wanted_size == 0) return NULL;
configASSERT(rb); configASSERT(rb);
configASSERT(rb->flags & flag_bytebuf); configASSERT(rb->flags & flag_bytebuf);
portENTER_CRITICAL_ISR(&rb->mux); portENTER_CRITICAL_ISR(&rb->mux);