Remove compiler warning by ensure prvInitialiseMutex() is not included if configUSE_M...

[freertos] / FreeRTOS / Demo / WIN32-MSVC-Static-Allocation-Only / main.c

diff --git a/FreeRTOS/Demo/WIN32-MSVC-Static-Allocation-Only/main.c b/FreeRTOS/Demo/WIN32-MSVC-Static-Allocation-Only/main.c
index d0324eae1689fa6f39d695c4209babee2f0413e5..b51b8dbb9c522c3154b8ad8afb7070d0142cf3db 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MSVC-Static-Allocation-Only/main.c
+++ b/FreeRTOS/Demo/WIN32-MSVC-Static-Allocation-Only/main.c
@@ -109,7 +109,7 @@ void vApplicationStackOverflowHook( TaskHandle_t pxTask, char *pcTaskName );
  * application callback function must be provided to supply the RAM that will\r
  * get used for the Idle task data structures and stack.\r
  */\r
-void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint16_t *pusIdleTaskStackSize );\r
+void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize );\r
 \r
 /*\r
 * This demo has configSUPPORT_STATIC_ALLOCATION set to 1 and configUSE_TIMERS\r
@@ -117,7 +117,7 @@ void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer, StackTy
 * supply the RAM that will get used for the Timer task data structures and\r
 * stack.\r
 */\r
-void vApplicationGetTimerTaskMemory( StaticTask_t **ppxTimerTaskTCBBuffer, StackType_t **ppxTimerTaskStackBuffer, uint16_t *pusTimerTaskStackSize );\r
+void vApplicationGetTimerTaskMemory( StaticTask_t **ppxTimerTaskTCBBuffer, StackType_t **ppxTimerTaskStackBuffer, uint32_t *pulTimerTaskStackSize );\r
 \r
 /* This demo only uses the standard demo tasks that use statically allocated\r
 RAM.  A 'check' task is also created to periodically inspect the demo tasks to\r
@@ -166,7 +166,7 @@ static StackType_t ucTaskStack[ configMINIMAL_STACK_SIZE * sizeof( StackType_t )
 \r
        /* Create the task, which will use the RAM allocated by the linker to the\r
        variables declared in this function. */\r
-       xTaskCreateStatic( prvCheckTask, "Check", configMINIMAL_STACK_SIZE, NULL, configMAX_PRIORITIES - 1, NULL, ucTaskStack, &xCheckTask );\r
+       xTaskCreateStatic( prvCheckTask, "Check", configMINIMAL_STACK_SIZE, NULL, configMAX_PRIORITIES - 1, ucTaskStack, &xCheckTask );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -244,7 +244,7 @@ volatile uint32_t ulSetToNonZeroInDebuggerToContinue = 0;
 /* configUSE_STATIC_ALLOCATION is set to 1, so the application must provide an\r
 implementation of vApplicationGetIdleTaskMemory() to provide the memory that is\r
 used by the Idle task. */\r
-void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint16_t *pusIdleTaskStackSize )\r
+void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize )\r
 {\r
 /* If the buffers to be provided to the Idle task are declared inside this\r
 function then they must be declared static - otherwise they will be allocated on\r
@@ -262,14 +262,14 @@ static StackType_t uxIdleTaskStack[ configMINIMAL_STACK_SIZE ];
        /* Pass out the size of the array pointed to by *ppxIdleTaskStackBuffer.\r
        Note that, as the array is necessarily of type StackType_t,\r
        configMINIMAL_STACK_SIZE is specified in words, not bytes. */\r
-       *pusIdleTaskStackSize = configMINIMAL_STACK_SIZE;\r
+       *pulIdleTaskStackSize = configMINIMAL_STACK_SIZE;\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 /* configUSE_STATIC_ALLOCATION and configUSE_TIMERS are both set to 1, so the\r
 application must provide an implementation of vApplicationGetTimerTaskMemory()\r
 to provide the memory that is used by the Timer service task. */\r
-void vApplicationGetTimerTaskMemory( StaticTask_t **ppxTimerTaskTCBBuffer, StackType_t **ppxTimerTaskStackBuffer, uint16_t *pusTimerTaskStackSize )\r
+void vApplicationGetTimerTaskMemory( StaticTask_t **ppxTimerTaskTCBBuffer, StackType_t **ppxTimerTaskStackBuffer, uint32_t *pulTimerTaskStackSize )\r
 {\r
 /* If the buffers to be provided to the Timer task are declared inside this\r
 function then they must be declared static - otherwise they will be allocated on\r
@@ -287,6 +287,6 @@ static StackType_t uxTimerTaskStack[ configTIMER_TASK_STACK_DEPTH ];
        /* Pass out the size of the array pointed to by *ppxTimerTaskStackBuffer.\r
        Note that, as the array is necessarily of type StackType_t,\r
        configMINIMAL_STACK_SIZE is specified in words, not bytes. */\r
-       *pusTimerTaskStackSize = configMINIMAL_STACK_SIZE;\r
+       *pulTimerTaskStackSize = configTIMER_TASK_STACK_DEPTH;\r
 }\r
 \r