Added INCLUDE_xSemaphoreGetMutexHolder() default.

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

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c b/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c
index 514b88e80dbc4b9f50259856325501ee9372e3fa..2c79740d2a558588fe414bc202535b51535bda5f 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU/port.c
@@ -180,7 +180,7 @@ void MPU_vTaskDelayUntil( portTickType * const pxPreviousWakeTime, portTickType
 void MPU_vTaskDelay( portTickType xTicksToDelay );\r
 unsigned portBASE_TYPE MPU_uxTaskPriorityGet( xTaskHandle pxTask );\r
 void MPU_vTaskPrioritySet( xTaskHandle pxTask, unsigned portBASE_TYPE uxNewPriority );\r
-eTaskState MPU_eTaskStateGet( xTaskHandle pxTask );\r
+eTaskState MPU_eTaskGetState( xTaskHandle pxTask );\r
 void MPU_vTaskSuspend( xTaskHandle pxTaskToSuspend );\r
 signed portBASE_TYPE MPU_xTaskIsTaskSuspended( xTaskHandle xTask );\r
 void MPU_vTaskResume( xTaskHandle pxTaskToResume );\r
@@ -223,6 +223,7 @@ portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE
        /* Simulate the stack frame as it would be created by a context switch\r
        interrupt. */\r
        pxTopOfStack--; /* Offset added to account for the way the MCU uses the stack on entry/exit of interrupts. */\r
+       pxTopOfStack--; /* Offset added to ensure 8-byte alignment is maintained. */\r
        *pxTopOfStack = portINITIAL_XPSR;       /* xPSR */\r
        pxTopOfStack--;\r
        *pxTopOfStack = ( portSTACK_TYPE ) pxCode;      /* PC */\r
@@ -736,13 +737,13 @@ portBASE_TYPE xRunningPrivileged = prvRaisePrivilege();
 #endif\r
 /*-----------------------------------------------------------*/\r
 \r
-#if ( INCLUDE_eTaskStateGet == 1 )\r
-       eTaskState MPU_eTaskStateGet( xTaskHandle pxTask )\r
+#if ( INCLUDE_eTaskGetState == 1 )\r
+       eTaskState MPU_eTaskGetState( xTaskHandle pxTask )\r
        {\r
     portBASE_TYPE xRunningPrivileged = prvRaisePrivilege();\r
        eTaskState eReturn;\r
 \r
-               eReturn = eTaskStateGet( pxTask );\r
+               eReturn = eTaskGetState( pxTask );\r
         portRESET_PRIVILEGE( xRunningPrivileged );\r
                return eReturn;\r
        }\r