Skip to content

Commit f68f407

Browse files
committed
vApplicationGetIdleTaskMemory and vApplicationGetTimerTaskMemory set as weak with local static memory
1 parent b4ccdfe commit f68f407

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

CMSIS/RTOS2/FreeRTOS/Source/cmsis_os2.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1900,19 +1900,15 @@ __WEAK void vApplicationStackOverflowHook (TaskHandle_t xTask, signed char *pcTa
19001900
extern void vApplicationGetIdleTaskMemory (StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize);
19011901
extern void vApplicationGetTimerTaskMemory (StaticTask_t **ppxTimerTaskTCBBuffer, StackType_t **ppxTimerTaskStackBuffer, uint32_t *pulTimerTaskStackSize);
19021902

1903-
/* Idle task control block and stack */
1904-
static StaticTask_t Idle_TCB;
1905-
static StackType_t Idle_Stack[configMINIMAL_STACK_SIZE];
1906-
1907-
/* Timer task control block and stack */
1908-
static StaticTask_t Timer_TCB;
1909-
static StackType_t Timer_Stack[configTIMER_TASK_STACK_DEPTH];
1910-
19111903
/*
19121904
vApplicationGetIdleTaskMemory gets called when configSUPPORT_STATIC_ALLOCATION
19131905
equals to 1 and is required for static memory allocation support.
19141906
*/
1915-
void vApplicationGetIdleTaskMemory (StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize) {
1907+
__WEAK void vApplicationGetIdleTaskMemory (StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize) {
1908+
/* Idle task control block and stack */
1909+
static StaticTask_t Idle_TCB;
1910+
static StackType_t Idle_Stack[configMINIMAL_STACK_SIZE];
1911+
19161912
*ppxIdleTaskTCBBuffer = &Idle_TCB;
19171913
*ppxIdleTaskStackBuffer = &Idle_Stack[0];
19181914
*pulIdleTaskStackSize = (uint32_t)configMINIMAL_STACK_SIZE;
@@ -1922,7 +1918,11 @@ void vApplicationGetIdleTaskMemory (StaticTask_t **ppxIdleTaskTCBBuffer, StackTy
19221918
vApplicationGetTimerTaskMemory gets called when configSUPPORT_STATIC_ALLOCATION
19231919
equals to 1 and is required for static memory allocation support.
19241920
*/
1925-
void vApplicationGetTimerTaskMemory (StaticTask_t **ppxTimerTaskTCBBuffer, StackType_t **ppxTimerTaskStackBuffer, uint32_t *pulTimerTaskStackSize) {
1921+
__WEAK void vApplicationGetTimerTaskMemory (StaticTask_t **ppxTimerTaskTCBBuffer, StackType_t **ppxTimerTaskStackBuffer, uint32_t *pulTimerTaskStackSize) {
1922+
/* Timer task control block and stack */
1923+
static StaticTask_t Timer_TCB;
1924+
static StackType_t Timer_Stack[configTIMER_TASK_STACK_DEPTH];
1925+
19261926
*ppxTimerTaskTCBBuffer = &Timer_TCB;
19271927
*ppxTimerTaskStackBuffer = &Timer_Stack[0];
19281928
*pulTimerTaskStackSize = (uint32_t)configTIMER_TASK_STACK_DEPTH;

0 commit comments

Comments
 (0)