From bcddb11e8c24619fc0932b70096ce7d937e67d86 Mon Sep 17 00:00:00 2001 From: Dan Kalowsky Date: Thu, 16 Apr 2015 12:25:11 -0700 Subject: [PATCH] Rename _InsertCCS to _insert_ccs Updating nano 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 "Searching for ${1} to replace with ${2}" find . -type f \( -iname \*.c -o -iname \*.h -o -iname \*.s -o -iname \*.kconf \) \ -not \( -path host/src/genIdt -prune \) \ \ -not \( -path host/src/gen_tables -prune \) \ -print | xargs sed -i "s/"${1}"/"${2}"/g" Signed-off-by: Dan Kalowsky --- arch/arc/include/nanok.h | 2 +- arch/arm/include/nanok.h | 2 +- arch/x86/include/nanok.h | 2 +- kernel/nanokernel/core/nano_lifo.c | 4 ++-- kernel/nanokernel/core/nano_mwfifo.c | 4 ++-- kernel/nanokernel/core/nano_sema.c | 4 ++-- kernel/nanokernel/core/nano_stack.c | 4 ++-- kernel/nanokernel/core/nanofiber.c | 8 ++++---- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arc/include/nanok.h b/arch/arc/include/nanok.h index 3cebe953863..ed11d0901ca 100644 --- a/arch/arc/include/nanok.h +++ b/arch/arc/include/nanok.h @@ -264,7 +264,7 @@ static ALWAYS_INLINE int _IS_IN_ISR(void) return ((act & 0xffff) != 0); } -extern void _InsertCCS(tCCS **, tCCS *); +extern void _insert_ccs(tCCS **, tCCS *); extern void *_NewContext(char *, unsigned, _ContextEntry, _ContextArg, _ContextArg, _ContextArg, int, unsigned); diff --git a/arch/arm/include/nanok.h b/arch/arm/include/nanok.h index fdade0ab123..3000d4e144a 100644 --- a/arch/arm/include/nanok.h +++ b/arch/arm/include/nanok.h @@ -201,7 +201,7 @@ static ALWAYS_INLINE void fiberRtnValueSet( pEsf->a1 = value; } -extern void _InsertCCS(tCCS **, tCCS *); +extern void _insert_ccs(tCCS **, tCCS *); extern void *_NewContext(char *, unsigned, _ContextEntry, diff --git a/arch/x86/include/nanok.h b/arch/x86/include/nanok.h index b3107e2a7ef..c5ece561f4b 100644 --- a/arch/x86/include/nanok.h +++ b/arch/x86/include/nanok.h @@ -917,7 +917,7 @@ typedef unsigned char extern void nano_cpu_atomic_idle(unsigned int imask); extern unsigned _Swap(unsigned int mask); -extern void _InsertCCS(tCCS **queue, tCCS *ccs); +extern void _insert_ccs(tCCS **queue, tCCS *ccs); extern void _NewContextUsr(void *ccs, int prio, unsigned options); extern void *_NewContext(char *pStack, diff --git a/kernel/nanokernel/core/nano_lifo.c b/kernel/nanokernel/core/nano_lifo.c index 9a05016a840..733880f9ea1 100644 --- a/kernel/nanokernel/core/nano_lifo.c +++ b/kernel/nanokernel/core/nano_lifo.c @@ -121,7 +121,7 @@ void _LifoPut(struct nano_lifo *chan, /* channel on which to put */ chan->proc = (tCCS *)0; fiberRtnValueSet(ccs, (unsigned int)data); - _InsertCCS((tCCS **)&_NanoKernel.fiber, ccs); + _insert_ccs((tCCS **)&_NanoKernel.fiber, ccs); } else { *(void **)data = chan->list; chan->list = data; @@ -155,7 +155,7 @@ void nano_task_lifo_put( chan->proc = (tCCS *)0; fiberRtnValueSet(ccs, (unsigned int)data); - _InsertCCS((tCCS **)&_NanoKernel.fiber, ccs); + _insert_ccs((tCCS **)&_NanoKernel.fiber, ccs); /* swap into the newly ready fiber */ diff --git a/kernel/nanokernel/core/nano_mwfifo.c b/kernel/nanokernel/core/nano_mwfifo.c index 957eb7e032d..5a3601fafd8 100644 --- a/kernel/nanokernel/core/nano_mwfifo.c +++ b/kernel/nanokernel/core/nano_mwfifo.c @@ -132,7 +132,7 @@ void _FifoPut(struct nano_fifo *chan, /* channel on which to interact */ ccs->link = 0; fiberRtnValueSet(ccs, (unsigned int)data); - _InsertCCS((tCCS **)&_NanoKernel.fiber, ccs); + _insert_ccs((tCCS **)&_NanoKernel.fiber, ccs); } else { *(void **)chan->tail = data; chan->tail = data; @@ -177,7 +177,7 @@ void nano_task_fifo_put( ccs->link = 0; fiberRtnValueSet(ccs, (unsigned int)data); - _InsertCCS((tCCS **)&_NanoKernel.fiber, ccs); + _insert_ccs((tCCS **)&_NanoKernel.fiber, ccs); /* swap into the fiber just made ready */ diff --git a/kernel/nanokernel/core/nano_sema.c b/kernel/nanokernel/core/nano_sema.c index 6539a69082c..2c098275af0 100644 --- a/kernel/nanokernel/core/nano_sema.c +++ b/kernel/nanokernel/core/nano_sema.c @@ -113,7 +113,7 @@ void _SemGive(struct nano_sem *chan /* semaphore on which to signal */ ccs = chan->proc; if (ccs != (tCCS *)NULL) { chan->proc = 0; - _InsertCCS((tCCS **)&_NanoKernel.fiber, ccs); + _insert_ccs((tCCS **)&_NanoKernel.fiber, ccs); } else { chan->nsig++; } @@ -143,7 +143,7 @@ void nano_task_sem_give( ccs = chan->proc; if (ccs != (tCCS *)NULL) { chan->proc = 0; - _InsertCCS((tCCS **)&_NanoKernel.fiber, ccs); + _insert_ccs((tCCS **)&_NanoKernel.fiber, ccs); /* swap into the newly ready fiber */ diff --git a/kernel/nanokernel/core/nano_stack.c b/kernel/nanokernel/core/nano_stack.c index 92cd8a3471c..482648b306b 100644 --- a/kernel/nanokernel/core/nano_stack.c +++ b/kernel/nanokernel/core/nano_stack.c @@ -125,7 +125,7 @@ void _StackPush(struct nano_stack *chan, /* stack channel on if (ccs != (tCCS *)NULL) { chan->proc = 0; fiberRtnValueSet(ccs, data); - _InsertCCS((tCCS **)&_NanoKernel.fiber, ccs); + _insert_ccs((tCCS **)&_NanoKernel.fiber, ccs); } else { *(chan->next) = data; chan->next++; @@ -159,7 +159,7 @@ void nano_task_stack_push( if (ccs != (tCCS *)NULL) { chan->proc = 0; fiberRtnValueSet(ccs, data); - _InsertCCS((tCCS **)&_NanoKernel.fiber, ccs); + _insert_ccs((tCCS **)&_NanoKernel.fiber, ccs); /* swap into the newly ready fiber */ diff --git a/kernel/nanokernel/core/nanofiber.c b/kernel/nanokernel/core/nanofiber.c index 24447add8d4..9213962fba3 100644 --- a/kernel/nanokernel/core/nanofiber.c +++ b/kernel/nanokernel/core/nanofiber.c @@ -62,7 +62,7 @@ const char * const build_timestamp = BUILD_TIMESTAMP; /******************************************************************************* * -* _InsertCCS - add a context into the list of runnable contexts +* _insert_ccs - add a context into the list of runnable contexts * * The list of runnable contexts is maintained via a single linked list * in priority order. Numerically lower priorities represent higher priority @@ -73,7 +73,7 @@ const char * const build_timestamp = BUILD_TIMESTAMP; * RETURNS: N/A */ -void _InsertCCS(tCCS **queue, tCCS *ccs) +void _insert_ccs(tCCS **queue, tCCS *ccs) { tCCS *pQ; @@ -210,7 +210,7 @@ void _FiberStart(char *pStack, /* insert thew newly crafted CCS into the fiber runnable context list */ - _InsertCCS((tCCS **)&_NanoKernel.fiber, ccs); + _insert_ccs((tCCS **)&_NanoKernel.fiber, ccs); /* * Simply return to the caller if the current context is FIBER, @@ -249,7 +249,7 @@ void fiber_yield(void) * then swap to the context at the head of the fiber list. */ - _InsertCCS(&(_NanoKernel.fiber), _NanoKernel.current); + _insert_ccs(&(_NanoKernel.fiber), _NanoKernel.current); _Swap(imask); } else irq_unlock_inline(imask);