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

[freertos] / FreeRTOS / Source / portable / GCC / ARM_CM0 / port.c

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