Default configUSE_TICKLESS_IDLE to 0 when it is not defined.

Move location of traceTASK_CREATE() macro call.
Remove obsolete handling of trmCOMMAND_PROCESS_TIMER_OVERFLOW as the command was never used in release versions.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1811 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Source/include/FreeRTOS.h b/FreeRTOS/Source/include/FreeRTOS.h
index 2c0c28d8cf661ecee04faf6969f916d5766e01b4..99df4acda68ebf52382cb53af23a42023231572d 100644 (file)
--- a/FreeRTOS/Source/include/FreeRTOS.h
+++ b/FreeRTOS/Source/include/FreeRTOS.h
@@ -534,6 +534,10 @@ typedef portBASE_TYPE (*pdTASK_HOOK_CODE)( void * );
        #define portSUPPRESS_TICKS_AND_SLEEP( xExpectedIdleTime )\r
 #endif\r
 \r
+#ifndef configUSE_TICKLESS_IDLE\r
+       #define configUSE_TICKLESS_IDLE 0\r
+#endif\r
+\r
 #ifndef configPRE_SLEEP_PROCESSING\r
        #define configPRE_SLEEP_PROCESSING( x )\r
 #endif\r

diff --git a/FreeRTOS/Source/tasks.c b/FreeRTOS/Source/tasks.c
index ec8a0520e0c11ba1679815991e7cef27d57030a1..7bddc1ea5f91b43241c96c1b6e77d7306f23540a 100644 (file)
--- a/FreeRTOS/Source/tasks.c
+++ b/FreeRTOS/Source/tasks.c
@@ -614,12 +614,12 @@ tskTCB * pxNewTCB;
                        }\r
                        #endif\r
                        uxTaskNumber++;\r
+                       traceTASK_CREATE( pxNewTCB );\r
 \r
                        prvAddTaskToReadyQueue( pxNewTCB );\r
 \r
                        xReturn = pdPASS;\r
-                       portSETUP_TCB( pxNewTCB );\r
-                       traceTASK_CREATE( pxNewTCB );\r
+                       portSETUP_TCB( pxNewTCB );                      \r
                }\r
                taskEXIT_CRITICAL();\r
        }\r

diff --git a/FreeRTOS/Source/timers.c b/FreeRTOS/Source/timers.c
index f8cb7f8621b21d18406f99f1792cf07b9a61c1e4..e68cc03414a011bdc5959e37af5c9303dba9e2f0 100644 (file)
--- a/FreeRTOS/Source/timers.c
+++ b/FreeRTOS/Source/timers.c
@@ -520,16 +520,10 @@ portTickType xTimeNow;
        {\r
                pxTimer = xMessage.pxTimer;\r
 \r
-               /* Is the timer already in a list of active timers?  When the command\r
-               is trmCOMMAND_PROCESS_TIMER_OVERFLOW, the timer will be NULL as the\r
-               command is to the task rather than to an individual timer. */\r
-               if( pxTimer != NULL )\r
+               if( listIS_CONTAINED_WITHIN( NULL, &( pxTimer->xTimerListItem ) ) == pdFALSE )\r
                {\r
-                       if( listIS_CONTAINED_WITHIN( NULL, &( pxTimer->xTimerListItem ) ) == pdFALSE )\r
-                       {\r
-                               /* The timer is in a list, remove it. */\r
-                               uxListRemove( &( pxTimer->xTimerListItem ) );\r
-                       }\r
+                       /* The timer is in a list, remove it. */\r
+                       uxListRemove( &( pxTimer->xTimerListItem ) );\r
                }\r
 \r
                traceTIMER_COMMAND_RECEIVED( pxTimer, xMessage.xMessageID, xMessage.xMessageValue );\r