From b4f9a9e04d708d2650e190788015c408c611b30b Mon Sep 17 00:00:00 2001 From: Dan Kalowsky Date: Thu, 16 Apr 2015 12:25:11 -0700 Subject: [PATCH] Renaming _NanoStart to _nano_start 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 --- include/nanokernel/arc/v2/init.h | 2 +- include/nanokernel/arm/CortexM/init.h | 2 +- include/nanokernel/x86/arch.h | 2 +- kernel/common/bsp/init.c | 2 +- kernel/nanokernel/core/nanofiber.c | 8 ++++---- kernel/nanokernel/core/nanoinit.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/nanokernel/arc/v2/init.h b/include/nanokernel/arc/v2/init.h index f4924433167..f8a66272dd1 100644 --- a/include/nanokernel/arc/v2/init.h +++ b/include/nanokernel/arc/v2/init.h @@ -40,7 +40,7 @@ #ifndef _ASMLANGUAGE extern void _NanoInit(nano_context_id_t, int argc, char *argv[], char *envp[]); -extern void _NanoStart(void); +extern void _nano_start(void); #endif #endif /* _ARCH_ARC_V2_INIT_H_ */ diff --git a/include/nanokernel/arm/CortexM/init.h b/include/nanokernel/arm/CortexM/init.h index d1b2441ed47..6684989475f 100644 --- a/include/nanokernel/arm/CortexM/init.h +++ b/include/nanokernel/arm/CortexM/init.h @@ -40,7 +40,7 @@ ARM-specific nanokernel initialization interface. Included by ARM/arch.h. #ifndef _ASMLANGUAGE extern void _NanoInit(nano_context_id_t, int argc, char *argv[], char *envp[]); -extern void _NanoStart(void); +extern void _nano_start(void); #endif #endif /* _ARCH_ARM_CORTEXM_INIT_H_ */ diff --git a/include/nanokernel/x86/arch.h b/include/nanokernel/x86/arch.h index dd6ffbf994d..983437a3ff1 100644 --- a/include/nanokernel/x86/arch.h +++ b/include/nanokernel/x86/arch.h @@ -594,7 +594,7 @@ typedef void (*NANO_EOI_GET_FUNC) (void *); extern void _NanoInit (nano_context_id_t dummyOutContext, int argc, char *argv[], char *envp[]); -extern void _NanoStart (void); +extern void _nano_start (void); extern unsigned int find_first_set (unsigned int op); diff --git a/kernel/common/bsp/init.c b/kernel/common/bsp/init.c index 99bce9e9acf..7b096866fef 100644 --- a/kernel/common/bsp/init.c +++ b/kernel/common/bsp/init.c @@ -146,7 +146,7 @@ FUNC_NORETURN void _Cstart(void) /* context switch into the background context (entry function is main()) */ - _NanoStart(); + _nano_start(); /* * Compiler can't tell that the above routines won't return and issues diff --git a/kernel/nanokernel/core/nanofiber.c b/kernel/nanokernel/core/nanofiber.c index 46dcce5d3fa..923f9f83f38 100644 --- a/kernel/nanokernel/core/nanofiber.c +++ b/kernel/nanokernel/core/nanofiber.c @@ -316,12 +316,12 @@ FUNC_NORETURN void fiber_abort(void) /******************************************************************************* * -* _NanoStart - start the nanokernel +* _nano_start - start the nanokernel * * This routine is invoked as the last step of a BSP's _Cstart() implementation * to start the nanokernel. The _NanoInit() function is called early during * the execution of _Cstart() to setup the various nanokernel data structures, -* but it's not until _NanoStart() is invoked that a context switch into the +* but it's not until _nano_start() is invoked that a context switch into the * "main" task is performed. * * This routine should only be called from a BSP's _Cstart() implementation @@ -333,12 +333,12 @@ FUNC_NORETURN void fiber_abort(void) * Print the boot banner if enabled */ #ifdef CONFIG_BOOT_BANNER -void _NanoStart(void) +void _nano_start(void) { PRINT_BOOT_BANNER(); _nano_fiber_swap(); } #else -FUNC_ALIAS(_nano_fiber_swap, _NanoStart, void); +FUNC_ALIAS(_nano_fiber_swap, _nano_start, void); #endif diff --git a/kernel/nanokernel/core/nanoinit.c b/kernel/nanokernel/core/nanoinit.c index f4305e7b4b0..76fb993b611 100644 --- a/kernel/nanokernel/core/nanoinit.c +++ b/kernel/nanokernel/core/nanoinit.c @@ -85,7 +85,7 @@ extern void main(int argc, char *argv[], char *envp[]); * initialization sequence: * * crt0.s -> _Cstart() -> _NanoInit() -* -> _NanoStart() -> _Swap() (context switch into +* -> _nano_start() -> _Swap() (context switch into *"main") * * main () -> kernel_init () -> task_fiber_start(... K_swapper ...)