From c14557ab88f52e73aefd877ff5d385711c38d4a5 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Sat, 28 Oct 2006 10:41:34 +0000 Subject: [PATCH] Changes from V4.1.2: + BUG FIX: Removed the call to prvIsQueueEmpty from within xQueueCRReceive as it exited with interrupts enabled. Thanks Paul Katz. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@52 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- Source/queue.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/queue.c b/Source/queue.c index 488c8069a..8239180c2 100644 --- a/Source/queue.c +++ b/Source/queue.c @@ -60,6 +60,10 @@ Changes from V4.0.5 functions exiting when a block time remains and the function has not completed. +Changes from V4.1.2: + + + BUG FIX: Removed the call to prvIsQueueEmpty from within xQueueCRReceive + as it exited with interrupts enabled. Thanks Paul Katz. */ #include @@ -746,7 +750,7 @@ signed portBASE_TYPE xReturn; between the check to see if the queue is empty and blocking on the queue. */ portDISABLE_INTERRUPTS(); { - if( prvIsQueueEmpty( pxQueue ) ) + if( pxQueue->uxMessagesWaiting == ( unsigned portBASE_TYPE ) 0 ) { /* There are no messages in the queue, do we want to block or just leave with nothing? */ -- 2.39.5