Skip to content

pico_flash: Support FreeRTOS Static Allocation #2229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 7, 2025
Merged

pico_flash: Support FreeRTOS Static Allocation #2229

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0285d58
pico_flash: Support FreeRTOS Static Allocation
SConaway Feb 3, 2025
c116851
fix #if guard
kilograham Feb 4, 2025
7482c30
switch to xTaskCreateStaticAffinitySet
SConaway Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/rp2_common/pico_flash/flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,16 @@ static int default_enter_safe_zone_timeout_ms(__unused uint32_t timeout_ms) {
uint core_num = get_core_num();
// create at low priority on other core
TaskHandle_t task_handle;

// when FreeRTOS dynamic allocation is disabled (configSUPPORT_DYNAMIC_ALLOCATION == 0), the following fails
#if configSUPPORT_DYNAMIC_ALLOCATION
if (pdPASS != xTaskCreateAffinitySet(flash_lockout_task, "flash lockout", configMINIMAL_STACK_SIZE, (void *)core_num, 0, 1u << (core_num ^ 1), &task_handle)) {
#else
static StackType_t flash_lockout_stack[configMINIMAL_STACK_SIZE];
static StaticTask_t flash_lockout_task_tcb;
task_handle = xTaskCreateStaticAffinitySet(flash_lockout_task, "flash lockout", configMINIMAL_STACK_SIZE, (void *)core_num, 0, flash_lockout_stack, &flash_lockout_task_tcb, 1u << (core_num ^ 1));
if (task_handle == NULL) {
#endif
return PICO_ERROR_INSUFFICIENT_RESOURCES;
}
lockout_state[core_num] = FREERTOS_LOCKOUT_LOCKER_WAITING;
Expand Down Expand Up @@ -216,4 +225,4 @@ static int default_exit_safe_zone_timeout_ms(__unused uint32_t timeout_ms) {
#endif
}
return PICO_OK;
}
}