]> granicus.if.org Git - esp-idf/commitdiff
bugfix: ringbuffer return item api
authorWangjialin <wangjialin@espressif.com>
Thu, 24 Nov 2016 02:31:27 +0000 (10:31 +0800)
committerWangjialin <wangjialin@espressif.com>
Thu, 24 Nov 2016 02:31:27 +0000 (10:31 +0800)
Report from chunguang, vRingbufferReturnItem should not call portENTER_CRITICAL_ISR

components/freertos/ringbuf.c

index 67323e3276f28fa1fdb0dcbecf0088652c5f18da..7074eb537dd837081fc5658c471ef80e12c9832d 100644 (file)
@@ -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);
 }