Remove casts that were generating warnings (even though the casts were added to remov...

[freertos] / Source / tasks.c

diff --git a/Source/tasks.c b/Source/tasks.c
index 47a7be1cd654264c2e41a3b28b548c3ec2fa03e2..5eaebe2abadc038d8a46c9c5bd30bdaa05975660 100644 (file)
--- a/Source/tasks.c
+++ b/Source/tasks.c
@@ -1,5 +1,5 @@
 /*\r
-       FreeRTOS.org V4.6.1 - Copyright (C) 2003-2007 Richard Barry.\r
+       FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.\r
 \r
        This file is part of the FreeRTOS.org distribution.\r
 \r
@@ -24,13 +24,19 @@
        can be applied.\r
 \r
        ***************************************************************************\r
-       See http://www.FreeRTOS.org for documentation, latest information, license\r
-       and contact details.  Please ensure to read the configuration and relevant\r
-       port sections of the online documentation.\r
 \r
-       Also see http://www.SafeRTOS.com a version that has been certified for use\r
-       in safety critical systems, plus commercial licensing, development and\r
-       support options.\r
+       Please ensure to read the configuration and relevant port sections of the \r
+       online documentation.\r
+\r
+       +++ http://www.FreeRTOS.org +++\r
+       Documentation, latest information, license and contact details.  \r
+\r
+       +++ http://www.SafeRTOS.com +++\r
+       A version that is certified for use in safety critical systems.\r
+\r
+       +++ http://www.OpenRTOS.com +++\r
+       Commercial support, development, porting, licensing and training services.\r
+\r
        ***************************************************************************\r
 */\r
 \r
@@ -1213,7 +1219,11 @@ signed portBASE_TYPE xAlreadyYielded = pdFALSE;
                                        /* As we have processed some ticks it is appropriate to yield\r
                                        to ensure the highest priority task that is ready to run is\r
                                        the task actually running. */\r
-                                       xYieldRequired = pdTRUE;\r
+                                       #if configUSE_PREEMPTION == 1\r
+                                       {\r
+                                               xYieldRequired = pdTRUE;\r
+                                       }\r
+                                       #endif\r
                                }\r
                                \r
                                if( ( xYieldRequired == pdTRUE ) || ( xMissedYield == pdTRUE ) )\r
@@ -1329,7 +1339,7 @@ unsigned portBASE_TYPE uxNumberOfTasks;
        {\r
                portENTER_CRITICAL();\r
                {\r
-                       pcTraceBuffer = ( volatile signed portCHAR * volatile )pcBuffer;\r
+                       pcTraceBuffer = ( signed portCHAR * )pcBuffer;\r
                        pcTraceBufferStart = pcBuffer;\r
                        pcTraceBufferEnd = pcBuffer + ( ulBufferSize - tskSIZE_OF_EACH_TRACE_LINE );\r
                        xTracing = pdTRUE;\r
@@ -1985,7 +1995,7 @@ tskTCB *pxNewTCB;
                        /* Adjust the mutex holder state to account for its new priority. */\r
                        listSET_LIST_ITEM_VALUE( &( pxTCB->xEventListItem ), configMAX_PRIORITIES - ( portTickType ) pxCurrentTCB->uxPriority );\r
 \r
-                       /* If the task being modified is in the read state it will need to\r
+                       /* If the task being modified is in the ready state it will need to\r
                        be moved in to a new list. */\r
                        if( listIS_CONTAINED_WITHIN( &( pxReadyTasksLists[ pxTCB->uxPriority ] ), &( pxTCB->xGenericListItem ) ) )\r
                        {\r