Prepare for V7.0.0 release.

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

diff --git a/Source/tasks.c b/Source/tasks.c
index 0c48624976cef8bccf7bd2b545039135a4d2299b..7defe9bae680be855bae14d88152f411cf46a5da 100644 (file)
--- a/Source/tasks.c
+++ b/Source/tasks.c
@@ -465,14 +465,14 @@ tskTCB * pxNewTCB;
                        pxTopOfStack = ( portSTACK_TYPE * ) ( ( ( unsigned long ) pxTopOfStack ) & ( ( unsigned long ) ~portBYTE_ALIGNMENT_MASK  ) );\r
 \r
                        /* Check the alignment of the calculated top of stack is correct. */\r
-                       configASSERT( !( ( unsigned long ) pxTopOfStack & ( unsigned long ) portBYTE_ALIGNMENT_MASK ) );\r
+                       configASSERT( ( ( ( unsigned long ) pxTopOfStack & ( unsigned long ) portBYTE_ALIGNMENT_MASK ) == 0UL ) );\r
                }\r
                #else\r
                {\r
                        pxTopOfStack = pxNewTCB->pxStack;\r
                        \r
                        /* Check the alignment of the stack buffer is correct. */\r
-                       configASSERT( !( ( unsigned long ) pxNewTCB->pxStack & ( unsigned long ) portBYTE_ALIGNMENT_MASK ) );\r
+                       configASSERT( ( ( ( unsigned long ) pxNewTCB->pxStack & ( unsigned long ) portBYTE_ALIGNMENT_MASK ) == 0UL ) );\r
 \r
                        /* If we want to use stack checking on architectures that use\r
                        a positive stack growth direction then we also need to store the\r
@@ -499,7 +499,7 @@ tskTCB * pxNewTCB;
                #endif\r
 \r
                /* Check the alignment of the initialised stack. */\r
-               configASSERT( !( ( unsigned long ) pxNewTCB->pxTopOfStack & ( unsigned long ) portBYTE_ALIGNMENT_MASK ) );\r
+               configASSERT( ( ( ( unsigned long ) pxNewTCB->pxTopOfStack & ( unsigned long ) portBYTE_ALIGNMENT_MASK ) == 0UL ) );\r
 \r
                if( ( void * ) pxCreatedTask != NULL )\r
                {\r
@@ -1461,6 +1461,8 @@ unsigned portBASE_TYPE uxTaskGetNumberOfTasks( void )
 \r
 void vTaskIncrementTick( void )\r
 {\r
+tskTCB * pxTCB;\r
+\r
        /* Called by the portable layer each time a tick interrupt occurs.\r
        Increments the tick then checks to see if the new tick value will cause any\r
        tasks to be unblocked. */\r
@@ -1483,20 +1485,19 @@ void vTaskIncrementTick( void )
        \r
                        if( listLIST_IS_EMPTY( pxDelayedTaskList ) != pdFALSE )\r
                        {\r
-                               /* The delayed list is empty.  Set xNextTaskUnblockTime to the\r
-                               maximum possible value so it is extremely unlikely that the\r
-                               if( xTickCount >= xNextTaskUnblockTime ) test will pass\r
-                               until there is an item in the delayed list. */\r
+                               /* The new current delayed list is empty.  Set \r
+                               xNextTaskUnblockTime to the maximum possible value so it is \r
+                               extremely unlikely that the     \r
+                               if( xTickCount >= xNextTaskUnblockTime ) test will pass until \r
+                               there is an item in the delayed list. */\r
                                xNextTaskUnblockTime = portMAX_DELAY;\r
                        }\r
                        else\r
                        {\r
-                               tskTCB * pxTCB;\r
-\r
-                               /* The delayed list is not empty, get the value of the item at\r
-                               the head of the delayed list.  This is the time at which the\r
-                               task at the head of the delayed list should be removed from\r
-                               the Blocked state. */\r
+                               /* The new current delayed list is not empty, get the value of \r
+                               the item at the head of the delayed list.  This is the time at \r
+                               which the task at the head of the delayed list should be removed \r
+                               from the Blocked state. */\r
                                pxTCB = ( tskTCB * ) listGET_OWNER_OF_HEAD_ENTRY( pxDelayedTaskList );\r
                                xNextTaskUnblockTime = listGET_LIST_ITEM_VALUE( &( pxTCB->xGenericListItem ) );\r
                        }\r
@@ -2066,8 +2067,6 @@ static void prvInitialiseTCBVariables( tskTCB *pxTCB, const signed char * const
        {\r
        tskTCB *pxTCB;\r
        \r
-               configASSERT( xRegions );\r
-\r
                if( xTaskToModify == pxCurrentTCB )\r
                {\r
                        xTaskToModify = NULL;\r
@@ -2164,7 +2163,7 @@ static void prvAddCurrentTaskToDelayedList( portTickType xTimeToWake )
                vListInsert( ( xList * ) pxDelayedTaskList, ( xListItem * ) &( pxCurrentTCB->xGenericListItem ) );\r
 \r
                /* If the task entering the blocked state was placed at the head of the\r
-               list of blocked tasks then xNextTaskUnmblockTime needs to be updated\r
+               list of blocked tasks then xNextTaskUnblockTime needs to be updated\r
                too. */\r
                if( xTimeToWake < xNextTaskUnblockTime )\r
                {\r