From 71da62594c45f80ef17af2910f7f810cbf142504 Mon Sep 17 00:00:00 2001 From: Yonattan Louise Date: Mon, 24 Aug 2015 10:27:10 -0500 Subject: [PATCH] Rename microkernel struct field 'fstart' to 'fn_start'. Rename field 'fstart' of the struct: - 'k_proc' in the file include/microkernel/base_api.h Also rename variable instances related to this struct field. Change-Id: Ic9750c0bcaefd1dcedfefe94b8cdd31519ab5249 Signed-off-by: Yonattan Louise --- include/microkernel/base_api.h | 2 +- include/microkernel/task.h | 6 +++--- kernel/microkernel/k_task.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/microkernel/base_api.h b/include/microkernel/base_api.h index 7ec8f7a1c23..c7b46ec8b09 100644 --- a/include/microkernel/base_api.h +++ b/include/microkernel/base_api.h @@ -112,7 +112,7 @@ struct k_task { ktask_t id; uint32_t state; uint32_t group; - void (*fstart)(void); + void (*fn_start)(void); char *workspace; int worksize; void (*fabort)(void); diff --git a/include/microkernel/task.h b/include/microkernel/task.h index 37d9cb50326..efaa977443e 100644 --- a/include/microkernel/task.h +++ b/include/microkernel/task.h @@ -110,16 +110,16 @@ extern void task_group_leave(uint32_t groups); * @param priority Priority of task. * @param state State of task. * @param groups Groups this task belong to. - * @param fstart Entry function. + * @param fn_start Entry function. * @param workspace Pointer to workspace (aka, stack). * @param worksize Size of workspace. * @param fabort Abort function. */ #define __K_TASK_INITIALIZER(ident, priority, state, groups, \ - fstart, workspace, worksize, fabort) \ + fn_start, workspace, worksize, fabort) \ { \ NULL, NULL, priority, ident, state, ((groups) ^ SYS), \ - fstart, workspace, worksize, fabort, NULL, \ + fn_start, workspace, worksize, fabort, NULL, \ } /** diff --git a/kernel/microkernel/k_task.c b/kernel/microkernel/k_task.c index 8df707eb095..16558672460 100644 --- a/kernel/microkernel/k_task.c +++ b/kernel/microkernel/k_task.c @@ -333,7 +333,7 @@ void _k_task_op(struct k_args *A) switch (A->Args.g1.opt) { case TASK_START: - start_task(X, X->fstart); + start_task(X, X->fn_start); break; case TASK_ABORT: abort_task(X); @@ -400,7 +400,7 @@ void _k_task_group_op(struct k_args *A) if (X->group & grp) { switch (opt) { case TASK_GROUP_START: - start_task(X, X->fstart); + start_task(X, X->fn_start); break; case TASK_GROUP_ABORT: abort_task(X); @@ -599,6 +599,6 @@ void task_entry_set(ktask_t task, /* task */ { struct k_task *X = (struct k_task *)task; - X->fstart = func; + X->fn_start = func; }