From 6d502cebe9869cd86c7796f8108ebe8048fe41e7 Mon Sep 17 00:00:00 2001 From: Wangjialin Date: Thu, 24 Nov 2016 10:31:27 +0800 Subject: [PATCH] bugfix: ringbuffer return item api Report from chunguang, vRingbufferReturnItem should not call portENTER_CRITICAL_ISR --- components/freertos/ringbuf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/freertos/ringbuf.c b/components/freertos/ringbuf.c index 67323e3276..7074eb537d 100644 --- a/components/freertos/ringbuf.c +++ b/components/freertos/ringbuf.c @@ -609,9 +609,9 @@ void *xRingbufferReceiveUpToFromISR(RingbufHandle_t ringbuf, size_t *item_size, void vRingbufferReturnItem(RingbufHandle_t ringbuf, void *item) { ringbuf_t *rb=(ringbuf_t *)ringbuf; - portENTER_CRITICAL_ISR(&rb->mux); + portENTER_CRITICAL(&rb->mux); rb->returnItemToRingbufImpl(rb, item); - portEXIT_CRITICAL_ISR(&rb->mux); + portEXIT_CRITICAL(&rb->mux); xSemaphoreGive(rb->free_space_sem); } -- 2.40.0