diff --git a/include/microkernel/base_api.h b/include/microkernel/base_api.h index c7b46ec8b09..2dcae94a5ba 100644 --- a/include/microkernel/base_api.h +++ b/include/microkernel/base_api.h @@ -115,7 +115,7 @@ struct k_task { void (*fn_start)(void); char *workspace; int worksize; - void (*fabort)(void); + void (*fn_abort)(void); struct k_args *Args; }; diff --git a/include/microkernel/task.h b/include/microkernel/task.h index efaa977443e..3e0571231ba 100644 --- a/include/microkernel/task.h +++ b/include/microkernel/task.h @@ -113,13 +113,13 @@ extern void task_group_leave(uint32_t groups); * @param fn_start Entry function. * @param workspace Pointer to workspace (aka, stack). * @param worksize Size of workspace. - * @param fabort Abort function. + * @param fn_abort Abort function. */ #define __K_TASK_INITIALIZER(ident, priority, state, groups, \ - fn_start, workspace, worksize, fabort) \ + fn_start, workspace, worksize, fn_abort) \ { \ NULL, NULL, priority, ident, state, ((groups) ^ SYS), \ - fn_start, workspace, worksize, fabort, NULL, \ + fn_start, workspace, worksize, fn_abort, NULL, \ } /** diff --git a/kernel/microkernel/k_task.c b/kernel/microkernel/k_task.c index 16558672460..aed50e4e76a 100644 --- a/kernel/microkernel/k_task.c +++ b/kernel/microkernel/k_task.c @@ -232,7 +232,7 @@ static void start_task(struct k_task *X, /* ptr to task control block */ task_options /* options */ ); - X->fabort = NULL; + X->fn_abort = NULL; _k_state_bit_reset(X, TF_STOP | TF_TERM); } @@ -259,8 +259,8 @@ static void abort_task(struct k_task *X) /* Invoke abort function, if there is one */ - if (X->fabort != NULL) { - X->fabort(); + if (X->fn_abort != NULL) { + X->fn_abort(); } } @@ -312,7 +312,7 @@ FUNC_NORETURN void _TaskAbort(void) void task_abort_handler_set(void (*func)(void) /* abort handler */ ) { - _k_current_task->fabort = func; + _k_current_task->fn_abort = func; } /**