len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-19 21:11:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor tidying up of IntQueue.c to prevent compiler warnings. No functional difference.

Browse source
This commit is contained in:
Richard Barry 2010-08-29 17:13:46 +00:00
parent 5c75dd907e
commit 50b4b6619d
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Demo/Common/Minimal/IntQueue.c
View file

@ -33,9 +33,9 @@
FreeRTOS is distributed in the hope that it will be useful, but WITHOUT FreeRTOS is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details. You should have received a copy of the GNU General Public more details. You should have received a copy of the GNU General Public
License and the FreeRTOS license exception along with FreeRTOS; if not it License and the FreeRTOS license exception along with FreeRTOS; if not it
can be viewed here: http://www.freertos.org/a00114.html and also obtained can be viewed here: http://www.freertos.org/a00114.html and also obtained
by writing to Richard Barry, contact details for whom are available on the by writing to Richard Barry, contact details for whom are available on the
FreeRTOS WEB site. FreeRTOS WEB site.
@ -172,7 +172,7 @@ static unsigned portBASE_TYPE uxHighPriorityLoops1 = 0, uxHighPriorityLoops2 = 0
/* Any unexpected behaviour sets xErrorStatus to fail and log the line that /* Any unexpected behaviour sets xErrorStatus to fail and log the line that
caused the error in xErrorLine. */ caused the error in xErrorLine. */
static portBASE_TYPE xErrorStatus = pdPASS; static portBASE_TYPE xErrorStatus = pdPASS;
static unsigned portBASE_TYPE xErrorLine = ( unsigned portBASE_TYPE ) 0; static volatile unsigned portBASE_TYPE xErrorLine = ( unsigned portBASE_TYPE ) 0;
/* Used for sequencing between tasks. */ /* Used for sequencing between tasks. */
static portBASE_TYPE xWasSuspended = pdFALSE; static portBASE_TYPE xWasSuspended = pdFALSE;
@ -392,14 +392,13 @@ unsigned portBASE_TYPE uxRxed, ux, uxTask1, uxTask2, uxErrorCount1 = 0, uxErrorC
static void prvLowerPriorityNormallyEmptyTask( void *pvParameters ) static void prvLowerPriorityNormallyEmptyTask( void *pvParameters )
{ {
unsigned portBASE_TYPE uxValue, uxRxed; unsigned portBASE_TYPE uxValue, uxRxed;
portBASE_TYPE xQueueStatus;
/* The parameters are not being used so avoid compiler warnings. */ /* The parameters are not being used so avoid compiler warnings. */
( void ) pvParameters; ( void ) pvParameters;
for( ;; ) for( ;; )
{ {
if( ( xQueueStatus = xQueueReceive( xNormallyEmptyQueue, &uxRxed, intqONE_TICK_DELAY ) ) != errQUEUE_EMPTY ) if( xQueueReceive( xNormallyEmptyQueue, &uxRxed, intqONE_TICK_DELAY ) != errQUEUE_EMPTY )
{ {
/* We should only obtain a value when the high priority task is /* We should only obtain a value when the high priority task is
suspended. */ suspended. */
@ -441,7 +440,6 @@ portBASE_TYPE xQueueStatus;
static void prv1stHigherPriorityNormallyFullTask( void *pvParameters ) static void prv1stHigherPriorityNormallyFullTask( void *pvParameters )
{ {
unsigned portBASE_TYPE uxValueToTx, ux; unsigned portBASE_TYPE uxValueToTx, ux;
portBASE_TYPE xQueueStatus;
/* The parameters are not being used so avoid compiler warnings. */ /* The parameters are not being used so avoid compiler warnings. */
( void ) pvParameters; ( void ) pvParameters;
@ -469,7 +467,7 @@ portBASE_TYPE xQueueStatus;
} }
portEXIT_CRITICAL(); portEXIT_CRITICAL();
if( ( xQueueStatus = xQueueSend( xNormallyFullQueue, &uxValueToTx, intqSHORT_DELAY ) ) != pdPASS ) if( xQueueSend( xNormallyFullQueue, &uxValueToTx, intqSHORT_DELAY ) != pdPASS )
{ {
/* intqHIGH_PRIORITY_TASK2 is never suspended so we would not /* intqHIGH_PRIORITY_TASK2 is never suspended so we would not
expect it to ever time out. */ expect it to ever time out. */
@ -531,7 +529,6 @@ portBASE_TYPE xQueueStatus;
static void prv2ndHigherPriorityNormallyFullTask( void *pvParameters ) static void prv2ndHigherPriorityNormallyFullTask( void *pvParameters )
{ {
unsigned portBASE_TYPE uxValueToTx, ux; unsigned portBASE_TYPE uxValueToTx, ux;
portBASE_TYPE xQueueStatus;
/* The parameters are not being used so avoid compiler warnings. */ /* The parameters are not being used so avoid compiler warnings. */
( void ) pvParameters; ( void ) pvParameters;
@ -559,7 +556,7 @@ portBASE_TYPE xQueueStatus;
} }
portEXIT_CRITICAL(); portEXIT_CRITICAL();
if( ( xQueueStatus = xQueueSend( xNormallyFullQueue, &uxValueToTx, intqSHORT_DELAY ) ) != pdPASS ) if( xQueueSend( xNormallyFullQueue, &uxValueToTx, intqSHORT_DELAY ) != pdPASS )
{ {
if( xWasSuspended != pdTRUE ) if( xWasSuspended != pdTRUE )
{ {
@ -578,14 +575,13 @@ portBASE_TYPE xQueueStatus;
static void prvLowerPriorityNormallyFullTask( void *pvParameters ) static void prvLowerPriorityNormallyFullTask( void *pvParameters )
{ {
unsigned portBASE_TYPE uxValue, uxTxed = 9999; unsigned portBASE_TYPE uxValue, uxTxed = 9999;
portBASE_TYPE xQueueStatus;
/* The parameters are not being used so avoid compiler warnings. */ /* The parameters are not being used so avoid compiler warnings. */
( void ) pvParameters; ( void ) pvParameters;
for( ;; ) for( ;; )
{ {
if( ( xQueueStatus = xQueueSend( xNormallyFullQueue, &uxTxed, intqONE_TICK_DELAY ) ) != errQUEUE_FULL ) if( xQueueSend( xNormallyFullQueue, &uxTxed, intqONE_TICK_DELAY ) != errQUEUE_FULL )
{ {
/* We would only expect to succeed when the higher priority task /* We would only expect to succeed when the higher priority task
is suspended. */ is suspended. */