Remove portALIGNMENT_ASSERT_pxCurrentTCB() macro, which serves no purpose.

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

diff --git a/FreeRTOS/Source/include/FreeRTOS.h b/FreeRTOS/Source/include/FreeRTOS.h
index 34fc4897223073bbc3b575a08a8ef4b022ef4ad4..852e24c79895d14f1967757a9c3d7a9ae3ca5233 100644 (file)
--- a/FreeRTOS/Source/include/FreeRTOS.h
+++ b/FreeRTOS/Source/include/FreeRTOS.h
@@ -231,10 +231,6 @@ typedef portBASE_TYPE (*pdTASK_HOOK_CODE)( void * );
        #define configASSERT( x )\r
 #endif\r
 \r
-#ifndef portALIGNMENT_ASSERT_pxCurrentTCB\r
-       #define portALIGNMENT_ASSERT_pxCurrentTCB configASSERT\r
-#endif\r
-\r
 /* The timers module relies on xTaskGetSchedulerState(). */\r
 #if configUSE_TIMERS == 1\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/portmacro.h
index 218c959758cd3a295716405882a270a1803d66a0..a313a645e17e63ba6e24f339589895b32f82c9ad 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/portmacro.h
@@ -214,10 +214,6 @@ extern void vPortExitCritical( void );
 \r
 #define portNOP()\r
 \r
-/* There are an uneven number of items on the initial stack, so\r
-portALIGNMENT_ASSERT_pxCurrentTCB() will trigger false positive asserts. */\r
-#define portALIGNMENT_ASSERT_pxCurrentTCB ( void )\r
-\r
 \r
 #ifdef __cplusplus\r
 }\r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h
index 3ad77b20cd5806521ea98837458ef259ed9c94d2..7d58e7b8244712c3090c74ee146ad588cb3664df 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h
@@ -136,10 +136,6 @@ extern void vPortClearInterruptMask( unsigned long ulNewMaskValue );
 #define portENTER_CRITICAL()                                   vPortEnterCritical()\r
 #define portEXIT_CRITICAL()                                            vPortExitCritical()\r
 \r
-/* There are an uneven number of items on the initial stack, so\r
-portALIGNMENT_ASSERT_pxCurrentTCB() will trigger false positive asserts. */\r
-#define portALIGNMENT_ASSERT_pxCurrentTCB ( void )\r
-\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Task function macros as described on the FreeRTOS.org WEB site.  These are\r

diff --git a/FreeRTOS/Source/portable/GCC/RX100/portmacro.h b/FreeRTOS/Source/portable/GCC/RX100/portmacro.h
index b10cd8ab60d2d22f0d51aa07bff57af07ad8831d..f5317c07b4db5562fb393a1dbc10115a8f6abaf2 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/RX100/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/RX100/portmacro.h
@@ -159,9 +159,6 @@ void vPortSetIPL( unsigned long ulNewIPL ) __attribute__((naked));
        #endif\r
 #endif\r
 \r
-/* This macro is not appropriate for this port so is defined away. */\r
-#define portALIGNMENT_ASSERT_pxCurrentTCB( x )\r
-\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Task function macros as described on the FreeRTOS.org WEB site. */\r

diff --git a/FreeRTOS/Source/portable/GCC/TriCore_1782/portmacro.h b/FreeRTOS/Source/portable/GCC/TriCore_1782/portmacro.h
index e06fa3851aa35ce6f37ee71ab8345a6a80cc4554..9448ea6c8c0cf90f7805abea49bd900cc67af5ca 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/TriCore_1782/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/TriCore_1782/portmacro.h
@@ -188,10 +188,6 @@ extern void vTaskExitCritical( void );
 extern unsigned long uxPortSetInterruptMaskFromISR( void );\r
 #define portSET_INTERRUPT_MASK_FROM_ISR()      uxPortSetInterruptMaskFromISR()\r
 \r
-/* As this port holds a CSA address in pxTopOfStack, the assert that checks the\r
-pxTopOfStack alignment is removed. */\r
-#define portALIGNMENT_ASSERT_pxCurrentTCB ( void )\r
-\r
 /* Pend a priority 1 interrupt, which will take care of the context switch. */\r
 #define portYIELD_FROM_ISR( xHigherPriorityTaskWoken )                 if( xHigherPriorityTaskWoken != pdFALSE ) {     CPU_SRC0.bits.SETR = 1; _isync(); }\r
 \r

diff --git a/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h
index a9c6e8890fa4523bd154159720893ff5d7cb41b2..8ef0e07245cbcc4bb2df6a8626a2a96ba1b51f7a 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/ARM_CM4F/portmacro.h
@@ -157,11 +157,6 @@ extern void vPortClearInterruptMask( unsigned long ulNewMask );
 #define portCLEAR_INTERRUPT_MASK_FROM_ISR(x)   vPortClearInterruptMask( x )\r
 /*-----------------------------------------------------------*/\r
 \r
-/* There are an uneven number of items on the initial stack, so\r
-portALIGNMENT_ASSERT_pxCurrentTCB() will trigger false positive asserts. */\r
-#define portALIGNMENT_ASSERT_pxCurrentTCB ( void )\r
-/*-----------------------------------------------------------*/\r
-\r
 /* Tickless idle/low power functionality. */\r
 #ifndef portSUPPRESS_TICKS_AND_SLEEP\r
        extern void vPortSuppressTicksAndSleep( portTickType xExpectedIdleTime );\r

diff --git a/FreeRTOS/Source/portable/IAR/RX100/portmacro.h b/FreeRTOS/Source/portable/IAR/RX100/portmacro.h
index c3cfe6c1bfa5740920a2ab8865b0d99c2c940f54..d8c421fb9c9fbfef3336f0e7d20962b2bee82b64 100644 (file)
--- a/FreeRTOS/Source/portable/IAR/RX100/portmacro.h
+++ b/FreeRTOS/Source/portable/IAR/RX100/portmacro.h
@@ -167,9 +167,6 @@ void vPortSetIPL( unsigned long ulNewIPL );
 #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters )\r
 #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )\r
 \r
-/* This macro is not appropriate for this port so is defined away. */\r
-#define portALIGNMENT_ASSERT_pxCurrentTCB( x )\r
-\r
 #ifdef __cplusplus\r
 }\r
 #endif\r

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h
index a3c1748a8601ac86ca8f0055505f21b419755d02..ef8fa625221c97fbe010cfb6042e3d91dddd6bb7 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CM4F/portmacro.h
@@ -138,11 +138,6 @@ extern void vPortExitCritical( void );
 \r
 /*-----------------------------------------------------------*/\r
 \r
-/* There are an uneven number of items on the initial stack, so\r
-portALIGNMENT_ASSERT_pxCurrentTCB() will trigger false positive asserts. */\r
-#define portALIGNMENT_ASSERT_pxCurrentTCB ( void )\r
-/*-----------------------------------------------------------*/\r
-\r
 /* Tickless idle/low power functionality. */\r
 #ifndef portSUPPRESS_TICKS_AND_SLEEP\r
        extern void vPortSuppressTicksAndSleep( portTickType xExpectedIdleTime );\r

diff --git a/FreeRTOS/Source/portable/Renesas/RX100/portmacro.h b/FreeRTOS/Source/portable/Renesas/RX100/portmacro.h
index ceea81dbf89942f8f49ee35c866f006620c2e9d4..88c3ddc3a1fdf4bc1b03cfd381b02767b07b8e5e 100644 (file)
--- a/FreeRTOS/Source/portable/Renesas/RX100/portmacro.h
+++ b/FreeRTOS/Source/portable/Renesas/RX100/portmacro.h
@@ -172,9 +172,6 @@ extern void vTaskExitCritical( void );
 #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters )\r
 #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )\r
 \r
-/* This macro is not appropriate for this port so is defined away. */\r
-#define portALIGNMENT_ASSERT_pxCurrentTCB( x )\r
-\r
 #ifdef __cplusplus\r
 }\r
 #endif\r

diff --git a/FreeRTOS/Source/portable/Renesas/RX200/portmacro.h b/FreeRTOS/Source/portable/Renesas/RX200/portmacro.h
index a3e234f53b5f6e74a8967028f5c2b6fd835e8f27..c9ef3f132abdb9621128af96e4fa038489f6f096 100644 (file)
--- a/FreeRTOS/Source/portable/Renesas/RX200/portmacro.h
+++ b/FreeRTOS/Source/portable/Renesas/RX200/portmacro.h
@@ -162,9 +162,6 @@ extern void vTaskExitCritical( void );
 #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters )\r
 #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )\r
 \r
-/* This macro is not appropriate for this port so is defined away. */\r
-#define portALIGNMENT_ASSERT_pxCurrentTCB( x )\r
-\r
 #ifdef __cplusplus\r
 }\r
 #endif\r

diff --git a/FreeRTOS/Source/portable/Tasking/ARM_CM4F/portmacro.h b/FreeRTOS/Source/portable/Tasking/ARM_CM4F/portmacro.h
index 9f12a88f150e1e962613a4f75768d0234f0dc5d4..c6313b21cb72e9773882f9447ec7c656d658aef1 100644 (file)
--- a/FreeRTOS/Source/portable/Tasking/ARM_CM4F/portmacro.h
+++ b/FreeRTOS/Source/portable/Tasking/ARM_CM4F/portmacro.h
@@ -155,10 +155,6 @@ extern void vPortExitCritical( void );
 #define portENTER_CRITICAL()           vPortEnterCritical()\r
 #define portEXIT_CRITICAL()                    vPortExitCritical()\r
 \r
-/* There are an uneven number of items on the initial stack, so\r
-portALIGNMENT_ASSERT_pxCurrentTCB() will trigger false positive asserts. */\r
-#define portALIGNMENT_ASSERT_pxCurrentTCB ( void )\r
-\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Task function macros as described on the FreeRTOS.org WEB site. */\r

diff --git a/FreeRTOS/Source/tasks.c b/FreeRTOS/Source/tasks.c
index abe3440669f520683c879371478bbbc4790223e3..6232e7eb4329e6e6c4efdbfb66619ded365180e2 100644 (file)
--- a/FreeRTOS/Source/tasks.c
+++ b/FreeRTOS/Source/tasks.c
@@ -540,9 +540,6 @@ tskTCB * pxNewTCB;
                }\r
                #endif /* portUSING_MPU_WRAPPERS */\r
 \r
-               /* Check the alignment of the initialised stack. */\r
-               portALIGNMENT_ASSERT_pxCurrentTCB( ( ( ( unsigned long ) pxNewTCB->pxTopOfStack & ( unsigned long ) portBYTE_ALIGNMENT_MASK ) == 0UL ) );\r
-\r
                if( ( void * ) pxCreatedTask != NULL )\r
                {\r
                        /* Pass the TCB out - in an anonymous way.  The calling function/\r
@@ -1843,10 +1840,10 @@ void vTaskSwitchContext( void )
                                        ulTotalRunTime = portGET_RUN_TIME_COUNTER_VALUE();\r
                                #endif\r
 \r
-                               /* Add the amount of time the task has been running to the \r
-                               accumulated     time so far.  The time the task started running was \r
-                               stored in ulTaskSwitchedInTime.  Note that there is no overflow \r
-                               protection here so count values are only valid until the timer \r
+                               /* Add the amount of time the task has been running to the\r
+                               accumulated     time so far.  The time the task started running was\r
+                               stored in ulTaskSwitchedInTime.  Note that there is no overflow\r
+                               protection here so count values are only valid until the timer\r
                                overflows.  The guard against negative values is to protect\r
                                against suspect run time stat counter implementations - which\r
                                are provided by the application, not the kernel. */\r