Remove guards against __ARMCC_VERSION version numbers that were previously used to...

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

diff --git a/FreeRTOS/Source/portable/ARMv8M/non_secure/portable/GCC/ARM_CM23/portasm.c b/FreeRTOS/Source/portable/ARMv8M/non_secure/portable/GCC/ARM_CM23/portasm.c
index e4fbe2d68853cf15e26f7afa9172e146e4ea5e05..e57ce9db1c9395c03dc6074632d36e8d7366bac3 100644 (file)
--- a/FreeRTOS/Source/portable/ARMv8M/non_secure/portable/GCC/ARM_CM23/portasm.c
+++ b/FreeRTOS/Source/portable/ARMv8M/non_secure/portable/GCC/ARM_CM23/portasm.c
@@ -210,13 +210,6 @@ uint32_t ulSetInterruptMaskFromISR( void ) /* __attribute__(( naked )) PRIVILEGE
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* To avoid compiler warnings.  The return statement will never be reached,\r
-        * but some compilers warn if it is not included, while others won't compile\r
-        * if it is. */\r
-       return 0;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -228,14 +221,6 @@ void vClearInterruptMaskFromISR( __attribute__( ( unused ) ) uint32_t ulMask ) /
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* Just to avoid compiler warning.  ulMask is used from the asm code but\r
-        * the compiler can't see that.  Some compilers generate warnings without\r
-        * the following line, while others generate warnings if the line is\r
-        * included. */\r
-       ( void ) ulMask;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/ARMv8M/non_secure/portable/GCC/ARM_CM23_NTZ/portasm.c b/FreeRTOS/Source/portable/ARMv8M/non_secure/portable/GCC/ARM_CM23_NTZ/portasm.c
index 3ce52c3d1b71e0d8540c2f88b6b2cda57da54b74..95ad2f2fc4f978a376c24337d20a426ef1d4a219 100644 (file)
--- a/FreeRTOS/Source/portable/ARMv8M/non_secure/portable/GCC/ARM_CM23_NTZ/portasm.c
+++ b/FreeRTOS/Source/portable/ARMv8M/non_secure/portable/GCC/ARM_CM23_NTZ/portasm.c
@@ -205,13 +205,6 @@ uint32_t ulSetInterruptMaskFromISR( void ) /* __attribute__(( naked )) PRIVILEGE
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* To avoid compiler warnings.  The return statement will never be reached,\r
-        * but some compilers warn if it is not included, while others won't compile\r
-        * if it is. */\r
-       return 0;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -223,14 +216,6 @@ void vClearInterruptMaskFromISR( __attribute__( ( unused ) ) uint32_t ulMask ) /
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* Just to avoid compiler warning.  ulMask is used from the asm code but\r
-        * the compiler can't see that.  Some compilers generate warnings without\r
-        * the following line, while others generate warnings if the line is\r
-        * included. */\r
-       ( void ) ulMask;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/ARMv8M/non_secure/portable/GCC/ARM_CM33/portasm.c b/FreeRTOS/Source/portable/ARMv8M/non_secure/portable/GCC/ARM_CM33/portasm.c
index f4be178c10d4bb9a96a20aeb504252d573a2ede5..dfec22deef178cee401d152054f4c427596ee9c0 100644 (file)
--- a/FreeRTOS/Source/portable/ARMv8M/non_secure/portable/GCC/ARM_CM33/portasm.c
+++ b/FreeRTOS/Source/portable/ARMv8M/non_secure/portable/GCC/ARM_CM33/portasm.c
@@ -185,13 +185,6 @@ uint32_t ulSetInterruptMaskFromISR( void ) /* __attribute__(( naked )) PRIVILEGE
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* To avoid compiler warnings.  The return statement will never be reached,\r
-        * but some compilers warn if it is not included, while others won't compile\r
-        * if it is. */\r
-       return 0;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -203,14 +196,6 @@ void vClearInterruptMaskFromISR( __attribute__( ( unused ) ) uint32_t ulMask ) /
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* Just to avoid compiler warning.  ulMask is used from the asm code but\r
-        * the compiler can't see that.  Some compilers generate warnings without\r
-        * the following line, while others generate warnings if the line is\r
-        * included. */\r
-       ( void ) ulMask;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/ARMv8M/non_secure/portable/GCC/ARM_CM33_NTZ/portasm.c b/FreeRTOS/Source/portable/ARMv8M/non_secure/portable/GCC/ARM_CM33_NTZ/portasm.c
index 2f87d0f6dcb13738ab77734ecc0d547a792f9d57..b6f1bbcef95a21a9c508bc764e7121ddb5d1e7a0 100644 (file)
--- a/FreeRTOS/Source/portable/ARMv8M/non_secure/portable/GCC/ARM_CM33_NTZ/portasm.c
+++ b/FreeRTOS/Source/portable/ARMv8M/non_secure/portable/GCC/ARM_CM33_NTZ/portasm.c
@@ -180,13 +180,6 @@ uint32_t ulSetInterruptMaskFromISR( void ) /* __attribute__(( naked )) PRIVILEGE
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* To avoid compiler warnings.  The return statement will never be reached,\r
-        * but some compilers warn if it is not included, while others won't compile\r
-        * if it is. */\r
-       return 0;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -198,14 +191,6 @@ void vClearInterruptMaskFromISR( __attribute__( ( unused ) ) uint32_t ulMask ) /
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* Just to avoid compiler warning.  ulMask is used from the asm code but\r
-        * the compiler can't see that.  Some compilers generate warnings without\r
-        * the following line, while others generate warnings if the line is\r
-        * included. */\r
-       ( void ) ulMask;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c
index 78601f688a84205acba120c9883f04344a270a7e..d0b50c3927e9747504aa895c49140933e15d064f 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM0/port.c
@@ -225,8 +225,8 @@ void vPortYield( void )
 \r
 void vPortEnterCritical( void )\r
 {\r
-    portDISABLE_INTERRUPTS();\r
-    uxCriticalNesting++;\r
+       portDISABLE_INTERRUPTS();\r
+       uxCriticalNesting++;\r
        __asm volatile( "dsb" ::: "memory" );\r
        __asm volatile( "isb" );\r
 }\r
@@ -235,11 +235,11 @@ void vPortEnterCritical( void )
 void vPortExitCritical( void )\r
 {\r
        configASSERT( uxCriticalNesting );\r
-    uxCriticalNesting--;\r
-    if( uxCriticalNesting == 0 )\r
-    {\r
-        portENABLE_INTERRUPTS();\r
-    }\r
+       uxCriticalNesting--;\r
+       if( uxCriticalNesting == 0 )\r
+       {\r
+               portENABLE_INTERRUPTS();\r
+       }\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -251,13 +251,6 @@ uint32_t ulSetInterruptMaskFromISR( void )
                                        " bx lr                           "\r
                                        ::: "memory"\r
                                  );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* To avoid compiler warnings.  The return statement will nevere be reached,\r
-       but some compilers warn if it is not included, while others won't compile if\r
-       it is. */\r
-       return 0;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -268,13 +261,6 @@ void vClearInterruptMaskFromISR( __attribute__( ( unused ) ) uint32_t ulMask )
                                        " bx lr                           "\r
                                        ::: "memory"\r
                                  );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* Just to avoid compiler warning.  ulMask is used from the asm code but\r
-       the compiler can't see that.  Some compilers generate warnings without the\r
-       following line, while others generate warnings if the line is included. */\r
-       ( void ) ulMask;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM23/non_secure/portasm.c b/FreeRTOS/Source/portable/GCC/ARM_CM23/non_secure/portasm.c
index e4fbe2d68853cf15e26f7afa9172e146e4ea5e05..e57ce9db1c9395c03dc6074632d36e8d7366bac3 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM23/non_secure/portasm.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM23/non_secure/portasm.c
@@ -210,13 +210,6 @@ uint32_t ulSetInterruptMaskFromISR( void ) /* __attribute__(( naked )) PRIVILEGE
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* To avoid compiler warnings.  The return statement will never be reached,\r
-        * but some compilers warn if it is not included, while others won't compile\r
-        * if it is. */\r
-       return 0;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -228,14 +221,6 @@ void vClearInterruptMaskFromISR( __attribute__( ( unused ) ) uint32_t ulMask ) /
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* Just to avoid compiler warning.  ulMask is used from the asm code but\r
-        * the compiler can't see that.  Some compilers generate warnings without\r
-        * the following line, while others generate warnings if the line is\r
-        * included. */\r
-       ( void ) ulMask;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM23_NTZ/non_secure/portasm.c b/FreeRTOS/Source/portable/GCC/ARM_CM23_NTZ/non_secure/portasm.c
index 3ce52c3d1b71e0d8540c2f88b6b2cda57da54b74..95ad2f2fc4f978a376c24337d20a426ef1d4a219 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM23_NTZ/non_secure/portasm.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM23_NTZ/non_secure/portasm.c
@@ -205,13 +205,6 @@ uint32_t ulSetInterruptMaskFromISR( void ) /* __attribute__(( naked )) PRIVILEGE
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* To avoid compiler warnings.  The return statement will never be reached,\r
-        * but some compilers warn if it is not included, while others won't compile\r
-        * if it is. */\r
-       return 0;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -223,14 +216,6 @@ void vClearInterruptMaskFromISR( __attribute__( ( unused ) ) uint32_t ulMask ) /
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* Just to avoid compiler warning.  ulMask is used from the asm code but\r
-        * the compiler can't see that.  Some compilers generate warnings without\r
-        * the following line, while others generate warnings if the line is\r
-        * included. */\r
-       ( void ) ulMask;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM33/non_secure/portasm.c b/FreeRTOS/Source/portable/GCC/ARM_CM33/non_secure/portasm.c
index f4be178c10d4bb9a96a20aeb504252d573a2ede5..dfec22deef178cee401d152054f4c427596ee9c0 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM33/non_secure/portasm.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM33/non_secure/portasm.c
@@ -185,13 +185,6 @@ uint32_t ulSetInterruptMaskFromISR( void ) /* __attribute__(( naked )) PRIVILEGE
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* To avoid compiler warnings.  The return statement will never be reached,\r
-        * but some compilers warn if it is not included, while others won't compile\r
-        * if it is. */\r
-       return 0;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -203,14 +196,6 @@ void vClearInterruptMaskFromISR( __attribute__( ( unused ) ) uint32_t ulMask ) /
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* Just to avoid compiler warning.  ulMask is used from the asm code but\r
-        * the compiler can't see that.  Some compilers generate warnings without\r
-        * the following line, while others generate warnings if the line is\r
-        * included. */\r
-       ( void ) ulMask;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c b/FreeRTOS/Source/portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c
index 2f87d0f6dcb13738ab77734ecc0d547a792f9d57..b6f1bbcef95a21a9c508bc764e7121ddb5d1e7a0 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c
@@ -180,13 +180,6 @@ uint32_t ulSetInterruptMaskFromISR( void ) /* __attribute__(( naked )) PRIVILEGE
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* To avoid compiler warnings.  The return statement will never be reached,\r
-        * but some compilers warn if it is not included, while others won't compile\r
-        * if it is. */\r
-       return 0;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -198,14 +191,6 @@ void vClearInterruptMaskFromISR( __attribute__( ( unused ) ) uint32_t ulMask ) /
        "       bx lr                                                                                   \n"\r
        ::: "memory"\r
        );\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
-       /* Just to avoid compiler warning.  ulMask is used from the asm code but\r
-        * the compiler can't see that.  Some compilers generate warnings without\r
-        * the following line, while others generate warnings if the line is\r
-        * included. */\r
-       ( void ) ulMask;\r
-#endif\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/FreeRTOS/Source/portable/GCC/RX100/port.c b/FreeRTOS/Source/portable/GCC/RX100/port.c
index 63adc01559bc5c5e968ec6569039a4e7956a7bb6..6fd49c80424ad756e14af1d20946b681d9808917 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/RX100/port.c
+++ b/FreeRTOS/Source/portable/GCC/RX100/port.c
@@ -46,7 +46,7 @@
 \r
 /* Tasks should start with interrupts enabled and in Supervisor mode, therefore\r
 PSW is set with U and I set, and PM and IPL clear. */\r
-#define portINITIAL_PSW     ( ( StackType_t ) 0x00030000 )\r
+#define portINITIAL_PSW         ( ( StackType_t ) 0x00030000 )\r
 \r
 /* The peripheral clock is divided by this value before being supplying the\r
 CMT. */\r
@@ -105,7 +105,7 @@ void vPortTickISR( void ) __attribute__((interrupt));
 static void prvSetupTimerInterrupt( void );\r
 #ifndef configSETUP_TICK_INTERRUPT\r
        /* The user has not provided their own tick interrupt configuration so use\r
-    the definition in this file (which uses the interval timer). */\r
+       the definition in this file (which uses the interval timer). */\r
        #define configSETUP_TICK_INTERRUPT() prvSetupTimerInterrupt()\r
 #endif /* configSETUP_TICK_INTERRUPT */\r
 \r
@@ -162,7 +162,7 @@ StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, TaskFunction_t px
        /* R0 is not included as it is the stack pointer. */\r
        *pxTopOfStack = 0x00;\r
        pxTopOfStack--;\r
-    *pxTopOfStack = 0x00;\r
+       *pxTopOfStack = 0x00;\r
        pxTopOfStack--;\r
        *pxTopOfStack = portINITIAL_PSW;\r
        pxTopOfStack--;\r
@@ -284,22 +284,22 @@ static void prvStartFirstTask( void )
 \r
                /* Restore the registers from the stack of the task pointed to by\r
                pxCurrentTCB. */\r
-           "POP                R15                                             \n" \\r
+               "POP            R15                                             \n" \\r
 \r
                /* Accumulator low 32 bits. */\r
-           "MVTACLO    R15                                     \n" \\r
-           "POP                R15                                             \n" \\r
+               "MVTACLO        R15                                     \n" \\r
+               "POP            R15                                             \n" \\r
 \r
                /* Accumulator high 32 bits. */\r
-           "MVTACHI    R15                                     \n" \\r
+               "MVTACHI        R15                                     \n" \\r
 \r
                /* R1 to R15 - R0 is not included as it is the SP. */\r
-           "POPM               R1-R15                                  \n" \\r
+               "POPM           R1-R15                                  \n" \\r
 \r
                /* This pops the remaining registers. */\r
-           "RTE                                                                \n" \\r
-           "NOP                                                                \n" \\r
-           "NOP                                                                \n"\r
+               "RTE                                                            \n" \\r
+               "NOP                                                            \n" \\r
+               "NOP                                                            \n"\r
        );\r
 }\r
 /*-----------------------------------------------------------*/\r
@@ -573,14 +573,14 @@ static void prvSetupTimerInterrupt( void )
                }\r
                else if( eSleepAction == eNoTasksWaitingTimeout )\r
                {\r
-                   /* Protection off. */\r
-                   SYSTEM.PRCR.WORD = portUNLOCK_KEY;\r
+                       /* Protection off. */\r
+                       SYSTEM.PRCR.WORD = portUNLOCK_KEY;\r
 \r
-                   /* Ready for software standby with all clocks stopped. */\r
+                       /* Ready for software standby with all clocks stopped. */\r
                        SYSTEM.SBYCR.BIT.SSBY = 1;\r
 \r
-                   /* Protection on. */\r
-                   SYSTEM.PRCR.WORD = portLOCK_KEY;\r
+                       /* Protection on. */\r
+                       SYSTEM.PRCR.WORD = portLOCK_KEY;\r
 \r
                        /* Sleep until something happens.  Calling prvSleep() will\r
                        automatically reset the i bit in the PSW. */\r
@@ -591,18 +591,18 @@ static void prvSetupTimerInterrupt( void )
                }\r
                else\r
                {\r
-                   /* Protection off. */\r
-                   SYSTEM.PRCR.WORD = portUNLOCK_KEY;\r
+                       /* Protection off. */\r
+                       SYSTEM.PRCR.WORD = portUNLOCK_KEY;\r
 \r
-                   /* Ready for deep sleep mode. */\r
+                       /* Ready for deep sleep mode. */\r
                        SYSTEM.MSTPCRC.BIT.DSLPE = 1;\r
                        SYSTEM.MSTPCRA.BIT.MSTPA28 = 1;\r
                        SYSTEM.SBYCR.BIT.SSBY = 0;\r
 \r
-                   /* Protection on. */\r
-                   SYSTEM.PRCR.WORD = portLOCK_KEY;\r
+                       /* Protection on. */\r
+                       SYSTEM.PRCR.WORD = portLOCK_KEY;\r
 \r
-                   /* Adjust the match value to take into account that the current\r
+                       /* Adjust the match value to take into account that the current\r
                        time slice is already partially complete. */\r
                        ulMatchValue -= ( uint32_t ) CMT0.CMCNT;\r
                        CMT0.CMCOR = ( uint16_t ) ulMatchValue;\r