espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-08 23:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ringbuffer_receive_upto_api' into 'master'

Browse Source 
bugfix: ring buffer

Fix API xRingbufferReceiveUpToFromISR

See merge request !327
This commit is contained in:
Angus Gratton
2016-12-21 10:01:13 +08:00
parent bae0149920 6a8a9a0272
commit 4f3ff1cf7e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/freertos/ringbuf.c
View File

@@ -600,7 +600,7 @@ void *xRingbufferReceiveUpToFromISR(RingbufHandle_t ringbuf, size_t *item_size,
configASSERT(rb); configASSERT(rb);
configASSERT(rb->flags & flag_bytebuf); configASSERT(rb->flags & flag_bytebuf);
portENTER_CRITICAL_ISR(&rb->mux); portENTER_CRITICAL_ISR(&rb->mux);
itemData=rb->getItemFromRingbufImpl(rb, item_size, 0); itemData=rb->getItemFromRingbufImpl(rb, item_size, wanted_size);
portEXIT_CRITICAL_ISR(&rb->mux); portEXIT_CRITICAL_ISR(&rb->mux);
return (void*)itemData; return (void*)itemData;
} }