alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ringbuffer_item_return_bug_report_from_chunguang' into 'master'

Browse Source 
bugfix: ringbuffer return item api

Report from chunguang, vRingbufferReturnItem should not call portENTER_CRITICAL_ISR

See merge request !246
This commit is contained in:
Jeroen Domburg 2016-11-25 09:31:20 +08:00
commit 7dc322273c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/freertos/ringbuf.c
View File

@ -609,9 +609,9 @@ void *xRingbufferReceiveUpToFromISR(RingbufHandle_t ringbuf, size_t *item_size,
void vRingbufferReturnItem(RingbufHandle_t ringbuf, void *item) void vRingbufferReturnItem(RingbufHandle_t ringbuf, void *item)
{ {
ringbuf_t *rb=(ringbuf_t *)ringbuf; ringbuf_t *rb=(ringbuf_t *)ringbuf;
portENTER_CRITICAL_ISR(&rb->mux); portENTER_CRITICAL(&rb->mux);
rb->returnItemToRingbufImpl(rb, item); rb->returnItemToRingbufImpl(rb, item);
portEXIT_CRITICAL_ISR(&rb->mux); portEXIT_CRITICAL(&rb->mux);
xSemaphoreGive(rb->free_space_sem); xSemaphoreGive(rb->free_space_sem);
} }