michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename microkernel struct field 'fabort' to 'fn_abort'.

Browse source 
Rename field 'fabort' of the struct:
- 'k_proc' in the file include/microkernel/base_api.h

Also rename variable instances related to this struct field.

Change-Id: I9523a567b23c578e73c20810e33a15ba733ba238
Signed-off-by: Yonattan Louise <yonattan.a.louise.mendoza@intel.com>
This commit is contained in:
Yonattan Louise 2015-08-24 10:28:51 -05:00 • committed by Anas Nashif
commit 3d0f283cb9
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/microkernel/base_api.h
View file

@ -115,7 +115,7 @@ struct k_task {
void (*fn_start)(void); void (*fn_start)(void);
char *workspace; char *workspace;
int worksize; int worksize;
void (*fabort)(void); void (*fn_abort)(void);
struct k_args *Args; struct k_args *Args;
}; };

6
include/microkernel/task.h
View file

@ -113,13 +113,13 @@ extern void task_group_leave(uint32_t groups);
* @param fn_start Entry function. * @param fn_start Entry function.
* @param workspace Pointer to workspace (aka, stack). * @param workspace Pointer to workspace (aka, stack).
* @param worksize Size of workspace. * @param worksize Size of workspace.
* @param fabort Abort function. * @param fn_abort Abort function.
*/ */
#define __K_TASK_INITIALIZER(ident, priority, state, groups, \ #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), \ NULL, NULL, priority, ident, state, ((groups) ^ SYS), \
fn_start, workspace, worksize, fabort, NULL, \ fn_start, workspace, worksize, fn_abort, NULL, \
} }
/** /**

8
kernel/microkernel/k_task.c
View file

@ -232,7 +232,7 @@ static void start_task(struct k_task *X, /* ptr to task control block */
task_options /* options */ task_options /* options */
); );
X->fabort = NULL; X->fn_abort = NULL;
_k_state_bit_reset(X, TF_STOP | TF_TERM); _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 */ /* Invoke abort function, if there is one */
if (X->fabort != NULL) { if (X->fn_abort != NULL) {
X->fabort(); X->fn_abort();
} }
} }
@ -312,7 +312,7 @@ FUNC_NORETURN void _TaskAbort(void)
void task_abort_handler_set(void (*func)(void) /* abort handler */ void task_abort_handler_set(void (*func)(void) /* abort handler */
) )
{ {
_k_current_task->fabort = func; _k_current_task->fn_abort = func;
} }
/** /**