\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
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
" 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
" 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