From fb0cf2ed7d01c7552b880af5ac24e2393c398a54 Mon Sep 17 00:00:00 2001 From: Dan Kalowsky Date: Tue, 28 Apr 2015 11:35:51 -0700 Subject: [PATCH] Renaming K_yield to _k_task_yield 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. Change accomplished with the following script: #!/bin/bash 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: Ie07e38bca912647e49a2c0914001690b7c545f3b Signed-off-by: Dan Kalowsky --- include/microkernel/entries.h | 2 +- kernel/microkernel/include/ktask.h | 2 +- kernel/microkernel/k_task.c | 4 ++-- kernel/microkernel/timer/ticker.c | 4 ++-- kernel/microkernel/timer/ticks.c | 2 +- scripts/sysgen.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/microkernel/entries.h b/include/microkernel/entries.h index b51b1197cfb..9432603a4b6 100644 --- a/include/microkernel/entries.h +++ b/include/microkernel/entries.h @@ -82,7 +82,7 @@ extern void K_wakeup(struct k_args *); extern void _k_task_op(struct k_args *); extern void _k_task_group_op(struct k_args *); extern void _k_task_priority_set(struct k_args *); -extern void K_yield(struct k_args *); +extern void _k_task_yield(struct k_args *); extern void K_alloc(struct k_args *); extern void K_dealloc(struct k_args *); extern void K_alloc_timer(struct k_args *); diff --git a/kernel/microkernel/include/ktask.h b/kernel/microkernel/include/ktask.h index bd33017e9e7..80f649cc197 100644 --- a/kernel/microkernel/include/ktask.h +++ b/kernel/microkernel/include/ktask.h @@ -43,6 +43,6 @@ extern void abort_task(struct k_proc *X); extern void _k_task_op(struct k_args *A); extern void _k_task_group_op(struct k_args *A); extern void _k_task_priority_set(struct k_args *A); -extern void K_yield(struct k_args *A); +extern void _k_task_yield(struct k_args *A); #endif diff --git a/kernel/microkernel/k_task.c b/kernel/microkernel/k_task.c index 83b01e1e781..d5781a38ae5 100644 --- a/kernel/microkernel/k_task.c +++ b/kernel/microkernel/k_task.c @@ -413,12 +413,12 @@ void task_priority_set(ktask_t task, /* task whose priority is to be set */ /******************************************************************************* * -* K_yield - handle task yield request +* _k_task_yield - handle task yield request * * RETURNS: N/A */ -void K_yield(struct k_args *A) +void _k_task_yield(struct k_args *A) { struct k_tqhd *H = _k_task_priority_list + _k_current_task->Prio; struct k_proc *X = _k_current_task->Forw; diff --git a/kernel/microkernel/timer/ticker.c b/kernel/microkernel/timer/ticker.c index dfebaee3307..65859671da2 100644 --- a/kernel/microkernel/timer/ticker.c +++ b/kernel/microkernel/timer/ticker.c @@ -42,7 +42,7 @@ This module implements the microkernel's tick event handler. #include #include /* WL stuff */ #include -#include /* K_yield */ +#include /* _k_task_yield */ #include #include #include @@ -191,7 +191,7 @@ static inline void _TimeSliceUpdate(void) (++slice_count >= slice_time); if (yield) { slice_count = 0; - K_yield(NULL); + _k_task_yield(NULL); } #else /* do nothing */ diff --git a/kernel/microkernel/timer/ticks.c b/kernel/microkernel/timer/ticks.c index 790eb5bb74f..949e33412df 100644 --- a/kernel/microkernel/timer/ticks.c +++ b/kernel/microkernel/timer/ticks.c @@ -33,7 +33,7 @@ #include #include #include /* WL and timeslice stuff */ -#include /* K_yield */ +#include /* _k_task_yield */ #include #include #include diff --git a/scripts/sysgen.py b/scripts/sysgen.py index 9e61aa33a87..61f47a197d5 100755 --- a/scripts/sysgen.py +++ b/scripts/sysgen.py @@ -800,7 +800,7 @@ def kernel_main_c_kernel_services(): "/* 43 */ _k_task_op,", # required "/* 44 */ _k_task_group_op,", # required "/* 45 */ _k_task_priority_set,", # required -"/* 46 */ K_yield,", # required +"/* 46 */ _k_task_yield,", # required "/* 47 */ K_alloc,", # depends on memory maps "/* 48 */ K_dealloc,", # depends on memory maps "/* 49 */ K_alloc_timer,", # depends on timers