michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Renaming GROUP_TASK_ macros to TASK_GROUP_

Browse source 
Updating micro kernel functions to follow a consistent naming convention.
Part of that process is the removal of camelCase naming conventions for the
preferred_underscore_method.  This specific change maps the macro to the
function naming used by the OS.

Change accomplished with the following script:

#!/bin/bash
echo "Searching for ${1} to replace with ${2}"

echo "Checking C, CPP, H, HPP, and s files..."
find . -type f \( -iname \*.[ch] -o -iname \*.[ch]pp -o -iname \*.s \) \
       -not \( -path host/src/genIdt -prune \) \
       -not \( -path host/src/gen_tables -prune \) \
       -print | xargs sed -i "s/"${1}"/"${2}"/g"

echo "Checking KCONF, LST, and PY files..."
find . -type f \( -iname \*.lst -o -iname \*.kconf -o -iname \*.py \) \
       -not \( -path host/src/genIdt -prune \) \
       -not \( -path host/src/gen_tables -prune \) \
       -print | xargs sed -i "s/"${1}"/"${2}"/g"

Change-Id: If41030c6b9f0417356807b0cc6f4c287378e0c17
Signed-off-by: Dan Kalowsky <daniel.kalowsky@intel.com>
This commit is contained in:
Dan Kalowsky 2015-04-30 14:22:47 -07:00 • committed by Anas Nashif
commit 9e8c06563e
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/microkernel/task.h
View file

@ -72,8 +72,8 @@ extern void task_abort_handler_set(void (*func)(void));
#define TASK_BLOCK 4 #define TASK_BLOCK 4
#define TASK_UNBLOCK 5 #define TASK_UNBLOCK 5
#define GROUP_TASK_BLOCK 4 #define TASK_GROUP_BLOCK 4
#define GROUP_TASK_UNBLOCK 5 #define TASK_GROUP_UNBLOCK 5
#ifdef CONFIG_TASK_MONITOR #ifdef CONFIG_TASK_MONITOR
extern void KS_TaskSetSwitchCallBack(taskswitchcallbackfunc func); extern void KS_TaskSetSwitchCallBack(taskswitchcallbackfunc func);

16
include/microkernel/task_api_export.h
View file

@ -38,19 +38,19 @@
#define TASK_SUSPEND 2 #define TASK_SUSPEND 2
#define TASK_RESUME 3 #define TASK_RESUME 3
#define GROUP_TASK_START 0 #define TASK_GROUP_START 0
#define GROUP_TASK_ABORT 1 #define TASK_GROUP_ABORT 1
#define GROUP_TASK_SUSPEND 2 #define TASK_GROUP_SUSPEND 2
#define GROUP_TASK_RESUME 3 #define TASK_GROUP_RESUME 3
#define task_abort(t) _task_ioctl(t, TASK_ABORT) #define task_abort(t) _task_ioctl(t, TASK_ABORT)
#define task_suspend(t) _task_ioctl(t, TASK_SUSPEND) #define task_suspend(t) _task_ioctl(t, TASK_SUSPEND)
#define task_resume(t) _task_ioctl(t, TASK_RESUME) #define task_resume(t) _task_ioctl(t, TASK_RESUME)
#define task_group_abort(g) _task_group_ioctl(g, GROUP_TASK_ABORT) #define task_group_abort(g) _task_group_ioctl(g, TASK_GROUP_ABORT)
#define task_group_suspend(g) _task_group_ioctl(g, GROUP_TASK_SUSPEND) #define task_group_suspend(g) _task_group_ioctl(g, TASK_GROUP_SUSPEND)
#define task_group_resume(g) _task_group_ioctl(g, GROUP_TASK_RESUME) #define task_group_resume(g) _task_group_ioctl(g, TASK_GROUP_RESUME)
#define task_start(t) _task_ioctl(t, TASK_START) #define task_start(t) _task_ioctl(t, TASK_START)
#define task_group_start(g) _task_group_ioctl(g, GROUP_TASK_START) #define task_group_start(g) _task_group_ioctl(g, TASK_GROUP_START)
#endif /* _task_api_export__h_ */ #endif /* _task_api_export__h_ */

16
kernel/microkernel/k_task.c
View file

@ -308,31 +308,31 @@ void _k_task_group_op(struct k_args *A)
struct k_proc *X; struct k_proc *X;
#ifdef CONFIG_TASK_DEBUG #ifdef CONFIG_TASK_DEBUG
if (opt == GROUP_TASK_BLOCK) if (opt == TASK_GROUP_BLOCK)
_k_debug_halt = 1; _k_debug_halt = 1;
if (opt == GROUP_TASK_UNBLOCK) if (opt == TASK_GROUP_UNBLOCK)
_k_debug_halt = 0; _k_debug_halt = 0;
#endif #endif
for (i = 0, X = _k_task_list; i < _k_task_count; i++, X++) { for (i = 0, X = _k_task_list; i < _k_task_count; i++, X++) {
if (X->Group & grp) { if (X->Group & grp) {
switch (opt) { switch (opt) {
case GROUP_TASK_START: case TASK_GROUP_START:
start_task(X, X->fstart); start_task(X, X->fstart);
break; break;
case GROUP_TASK_ABORT: case TASK_GROUP_ABORT:
abort_task(X); abort_task(X);
break; break;
case GROUP_TASK_SUSPEND: case TASK_GROUP_SUSPEND:
set_state_bit(X, TF_SUSP); set_state_bit(X, TF_SUSP);
break; break;
case GROUP_TASK_RESUME: case TASK_GROUP_RESUME:
reset_state_bit(X, TF_SUSP); reset_state_bit(X, TF_SUSP);
break; break;
case GROUP_TASK_BLOCK: case TASK_GROUP_BLOCK:
set_state_bit(X, TF_BLCK); set_state_bit(X, TF_BLCK);
break; break;
case GROUP_TASK_UNBLOCK: case TASK_GROUP_UNBLOCK:
reset_state_bit(X, TF_BLCK); reset_state_bit(X, TF_BLCK);
break; break;
} }