diff --git a/arch/arm/soc/st_stm32/stm32f3/soc.c b/arch/arm/soc/st_stm32/stm32f3/soc.c index 4c554051834..d1bb7bbcc02 100644 --- a/arch/arm/soc/st_stm32/stm32f3/soc.c +++ b/arch/arm/soc/st_stm32/stm32f3/soc.c @@ -9,7 +9,7 @@ * @brief System/hardware module for STM32F3 processor */ -#include +#include #include #include #include diff --git a/arch/riscv32/core/cpu_idle.c b/arch/riscv32/core/cpu_idle.c index d51477f4a34..babab6a70f0 100644 --- a/arch/riscv32/core/cpu_idle.c +++ b/arch/riscv32/core/cpu_idle.c @@ -9,11 +9,11 @@ /* * In RISC-V there is no conventional way to handle CPU power save. * Each RISC-V SOC handles it in its own way. - * Hence, by default, nano_cpu_idle and nano_cpu_atomic_idle functions just + * Hence, by default, k_cpu_idle and k_cpu_atomic_idle functions just * unlock interrupts and return to the caller, without issuing any CPU power * saving instruction. * - * Nonetheless, define the default nano_cpu_idle and nano_cpu_atomic_idle + * Nonetheless, define the default k_cpu_idle and k_cpu_atomic_idle * functions as weak functions, so that they can be replaced at the SOC-level. */ @@ -36,10 +36,6 @@ void __weak k_cpu_idle(void) * * @brief Atomically re-enable interrupts and enter low power mode * - * This function is utilized by the nanokernel object "wait" APIs for tasks, - * e.g. nano_task_lifo_get(), nano_task_sem_take(), - * nano_task_stack_pop(), and nano_task_fifo_get(). - * * INTERNAL * The requirements for k_cpu_atomic_idle() are as follows: * 1) The enablement of interrupts and entering a low-power mode needs to be diff --git a/arch/riscv32/core/fatal.c b/arch/riscv32/core/fatal.c index 77f7db955fe..4175b9936b9 100644 --- a/arch/riscv32/core/fatal.c +++ b/arch/riscv32/core/fatal.c @@ -4,8 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include -#include +#include #include #include @@ -50,7 +49,7 @@ const NANO_ESF _default_esf = { /** * - * @brief Nanokernel fatal error handler + * @brief Fatal error handler * * This routine is called when a fatal error condition is detected by either * hardware or software. diff --git a/arch/riscv32/include/kernel_arch_func.h b/arch/riscv32/include/kernel_arch_func.h index dad678392f3..969fdd2a5c0 100644 --- a/arch/riscv32/include/kernel_arch_func.h +++ b/arch/riscv32/include/kernel_arch_func.h @@ -22,8 +22,8 @@ extern "C" { #endif #ifndef _ASMLANGUAGE -void nano_cpu_idle(void); -void nano_cpu_atomic_idle(unsigned int key); +void k_cpu_idle(void); +void k_cpu_atomic_idle(unsigned int key); static ALWAYS_INLINE void nanoArchInit(void) { diff --git a/arch/xtensa/core/Makefile b/arch/xtensa/core/Makefile index e547ffc0766..24772e76dcb 100644 --- a/arch/xtensa/core/Makefile +++ b/arch/xtensa/core/Makefile @@ -2,7 +2,7 @@ ccflags-y += -I$(srctree)/kernel/unified/include asflags-y += -I$(srctree)/kernel/unified/include --longcalls ifdef CONFIG_ATOMIC_OPERATIONS_C -# Use C routines from kernel/nanokernel/atomic.c +# Use C routines from kernel/atomic_c.c obj-atomic= else # Use our own routines implmented in assembly diff --git a/arch/xtensa/core/cpu_idle.c b/arch/xtensa/core/cpu_idle.c index 6dab6cac138..55a55a203f5 100644 --- a/arch/xtensa/core/cpu_idle.c +++ b/arch/xtensa/core/cpu_idle.c @@ -26,7 +26,7 @@ void k_cpu_idle(void) * * This function exits with interrupts restored to . * - * void nano_cpu_atomic_idle(unsigned int key) + * void k_cpu_atomic_idle(unsigned int key) */ void k_cpu_atomic_idle(unsigned int key) { diff --git a/arch/xtensa/core/fatal.c b/arch/xtensa/core/fatal.c index 707b08bfd22..fa1e3f7e211 100644 --- a/arch/xtensa/core/fatal.c +++ b/arch/xtensa/core/fatal.c @@ -28,7 +28,7 @@ const NANO_ESF _default_esf = { /** * - * @brief Nanokernel fatal error handler + * @brief Fatal error handler * * This routine is called when fatal error conditions are detected by software * and is responsible only for reporting the error. Once reported, it then diff --git a/arch/xtensa/core/irq_offload.c b/arch/xtensa/core/irq_offload.c index 07be70981dc..6aefcf75f70 100644 --- a/arch/xtensa/core/irq_offload.c +++ b/arch/xtensa/core/irq_offload.c @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include #include #include diff --git a/arch/xtensa/core/offsets/offsets.c b/arch/xtensa/core/offsets/offsets.c index e2afc7e6aa1..cfc6a4fff85 100644 --- a/arch/xtensa/core/offsets/offsets.c +++ b/arch/xtensa/core/offsets/offsets.c @@ -9,11 +9,11 @@ * @brief Xtensa kernel structure member offset definition file * * This module is responsible for the generation of the absolute symbols whose - * value represents the member offsets for various Xtensa nanokernel + * value represents the member offsets for various Xtensa kernel * structures. * * All of the absolute symbols defined by this module will be present in the - * final kernel or nanokernel ELF image (due to the linker's reference to + * final kernel or kernel ELF image (due to the linker's reference to * the _OffsetAbsSyms symbol). * * INTERNAL diff --git a/arch/xtensa/core/xtensa_vectors.S b/arch/xtensa/core/xtensa_vectors.S index 13eb2f72d0f..150c1f27f47 100644 --- a/arch/xtensa/core/xtensa_vectors.S +++ b/arch/xtensa/core/xtensa_vectors.S @@ -198,7 +198,7 @@ #endif #ifdef CONFIG_SYS_POWER_MANAGEMENT -#if defined(CONFIG_NANOKERNEL) && defined(CONFIG_TICKLESS_IDLE) +#if defined(CONFIG_TICKLESS_IDLE) call0 _power_save_idle_exit #else movi a3, _kernel @@ -218,7 +218,7 @@ call4 _sys_power_save_idle_exit #endif /* __XTENSA_CALL0_ABI__ */ 10: -#endif /* defined(CONFIG_NANOKERNEL) && defined(CONFIG_TICKLESS_IDLE) */ +#endif /* defined(CONFIG_TICKLESS_IDLE) */ #endif /* CONFIG_SYS_POWER_MANAGEMENT */ /* Now look up in the dispatch table and call user ISR if any. */ diff --git a/arch/xtensa/include/kernel_arch_func.h b/arch/xtensa/include/kernel_arch_func.h index 56849d9c5de..d8f6285c50b 100644 --- a/arch/xtensa/include/kernel_arch_func.h +++ b/arch/xtensa/include/kernel_arch_func.h @@ -31,7 +31,7 @@ extern void _xt_coproc_init(void); * @brief Performs architecture-specific initialization * * This routine performs architecture-specific initialization of the - * nanokernel. Trivial stuff is done inline; more complex initialization is + * kernel. Trivial stuff is done inline; more complex initialization is * done via function calls. * * @return N/A @@ -66,7 +66,7 @@ _set_thread_return_value(struct k_thread *thread, unsigned int value) thread->callee_saved.retval = value; } -extern void nano_cpu_atomic_idle(unsigned int imask); +extern void k_cpu_atomic_idle(unsigned int imask); /* * Required by the core kernel even though we don't have to do anything on this diff --git a/drivers/pinmux/stm32/pinmux_board_stm3210c_eval.c b/drivers/pinmux/stm32/pinmux_board_stm3210c_eval.c index 367bee696b9..b8b40b68889 100644 --- a/drivers/pinmux/stm32/pinmux_board_stm3210c_eval.c +++ b/drivers/pinmux/stm32/pinmux_board_stm3210c_eval.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include #include #include diff --git a/drivers/pinmux/stm32/pinmux_board_stm32373c_eval.c b/drivers/pinmux/stm32/pinmux_board_stm32373c_eval.c index da6488f1d14..4ccb6e1f35a 100644 --- a/drivers/pinmux/stm32/pinmux_board_stm32373c_eval.c +++ b/drivers/pinmux/stm32/pinmux_board_stm32373c_eval.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include +#include #include #include #include diff --git a/drivers/timer/xtensa_sys_timer.c b/drivers/timer/xtensa_sys_timer.c index ae01f69896c..80e04fa7776 100644 --- a/drivers/timer/xtensa_sys_timer.c +++ b/drivers/timer/xtensa_sys_timer.c @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ +#include #include -#include #include #include diff --git a/include/arch/x86/arch.h b/include/arch/x86/arch.h index eed0ae575e1..946132d1f5b 100644 --- a/include/arch/x86/arch.h +++ b/include/arch/x86/arch.h @@ -260,7 +260,7 @@ extern void _arch_isr_direct_footer(int maybe_swap); static inline int name##_body(void) /** - * @brief Nanokernel Exception Stack Frame + * @brief Exception Stack Frame * * A pointer to an "exception stack frame" (ESF) is passed as an argument * to exception handlers registered via nanoCpuExcConnect(). As the system @@ -288,7 +288,7 @@ typedef struct nanoEsf { } NANO_ESF; /** - * @brief Nanokernel "interrupt stack frame" (ISF) + * @brief "interrupt stack frame" (ISF) * * An "interrupt stack frame" (ISF) as constructed by the processor and the * interrupt wrapper function _interrupt_enter(). As the system always @@ -491,7 +491,7 @@ extern void k_cpu_idle(void); extern uint32_t _timer_cycle_get_32(void); #define _arch_k_cycle_get_32() _timer_cycle_get_32() -/** Nanokernel provided routine to report any detected fatal error. */ +/** kernel provided routine to report any detected fatal error. */ extern FUNC_NORETURN void _NanoFatalErrorHandler(unsigned int reason, const NANO_ESF * pEsf); /** User provided routine to handle any detected fatal error post reporting. */ diff --git a/include/arch/xtensa/exc.h b/include/arch/xtensa/exc.h index 92df20ce0ea..b6542b28826 100644 --- a/include/arch/xtensa/exc.h +++ b/include/arch/xtensa/exc.h @@ -8,7 +8,7 @@ * @file * @brief Xtensa public exception handling * - * Xtensa-specific nanokernel exception handling interface. Included by + * Xtensa-specific kernel exception handling interface. Included by * arch/xtensa/arch.h. */ @@ -22,7 +22,7 @@ extern "C" { #ifdef _ASMLANGUAGE #else /** - * @brief Nanokernel Exception Stack Frame + * @brief Exception Stack Frame * * A pointer to an "exception stack frame" (ESF) is passed as an argument * to exception handlers registered via nanoCpuExcConnect(). diff --git a/tests/benchmarks/object_footprint/README.txt b/tests/benchmarks/object_footprint/README.txt index a9f518ed921..251420c0acd 100644 --- a/tests/benchmarks/object_footprint/README.txt +++ b/tests/benchmarks/object_footprint/README.txt @@ -1,4 +1,4 @@ -Title: Nanokernel Object Footprint Measurement +Title: Object Footprint Measurement Description: This sample builds multiple kernels with different configurations diff --git a/tests/drivers/build_all/src/main.c b/tests/drivers/build_all/src/main.c index c6d05b9836f..08ae38e32d2 100644 --- a/tests/drivers/build_all/src/main.c +++ b/tests/drivers/build_all/src/main.c @@ -11,7 +11,6 @@ /* * @file * @brief Hello World demo - * Nanokernel version of hello world demo */ diff --git a/tests/drivers/enc28j60/src/main.c b/tests/drivers/enc28j60/src/main.c index c6d05b9836f..08ae38e32d2 100644 --- a/tests/drivers/enc28j60/src/main.c +++ b/tests/drivers/enc28j60/src/main.c @@ -11,7 +11,6 @@ /* * @file * @brief Hello World demo - * Nanokernel version of hello world demo */ diff --git a/tests/drivers/nsim_uart/src/main.c b/tests/drivers/nsim_uart/src/main.c index c6d05b9836f..08ae38e32d2 100644 --- a/tests/drivers/nsim_uart/src/main.c +++ b/tests/drivers/nsim_uart/src/main.c @@ -11,7 +11,6 @@ /* * @file * @brief Hello World demo - * Nanokernel version of hello world demo */ diff --git a/tests/drivers/quark_clock/src/main.c b/tests/drivers/quark_clock/src/main.c index c6d05b9836f..08ae38e32d2 100644 --- a/tests/drivers/quark_clock/src/main.c +++ b/tests/drivers/quark_clock/src/main.c @@ -11,7 +11,6 @@ /* * @file * @brief Hello World demo - * Nanokernel version of hello world demo */ diff --git a/tests/kernel/fp_sharing/src/main.c b/tests/kernel/fp_sharing/src/main.c index 585cc8a8b5b..79f99960f7a 100644 --- a/tests/kernel/fp_sharing/src/main.c +++ b/tests/kernel/fp_sharing/src/main.c @@ -270,7 +270,7 @@ void load_store_high(void) * * The initial byte value, and thus the contents of the entire * float_reg_set structure, must be different for each - * thread to effectively test the nanokernel's ability to + * thread to effectively test the kernel's ability to * properly save/restore the floating point values during a * context switch. */ @@ -289,10 +289,10 @@ void load_store_high(void) * The goal of the loading all floating point registers with * values that differ from the values used in other threads is * to help determine whether the floating point register - * save/restore mechanism in the nanokernel's context switcher + * save/restore mechanism in the kernel's context switcher * is operating correctly. * - * When a subsequent nano_fiber_timer_test() invocation is + * When a subsequent k_timer_test() invocation is * performed, a (cooperative) context switch back to the * preempted task will occur. This context switch should result * in restoring the state of the task's floating point @@ -307,9 +307,9 @@ void load_store_high(void) * system clock tick, so that lower priority threads get a * chance to run. * - * This exercises the ability of the nanokernel to restore the + * This exercises the ability of the kernel to restore the * FPU state of a low priority thread _and_ the ability of the - * nanokernel to provide a "clean" FPU state to this thread + * kernel to provide a "clean" FPU state to this thread * once the sleep ends. */ diff --git a/tests/kernel/fp_sharing/src/pi.c b/tests/kernel/fp_sharing/src/pi.c index d395e45814a..217640738a0 100644 --- a/tests/kernel/fp_sharing/src/pi.c +++ b/tests/kernel/fp_sharing/src/pi.c @@ -128,9 +128,9 @@ void calculate_pi_high(void) * system clock tick, so that lower priority threads get a * chance to run. * - * This exercises the ability of the nanokernel to restore the + * This exercises the ability of the kernel to restore the * FPU state of a low priority thread _and_ the ability of the - * nanokernel to provide a "clean" FPU state to this thread + * kernel to provide a "clean" FPU state to this thread * once the sleep ends. */ diff --git a/tests/kernel/mem_safe/README.txt b/tests/kernel/mem_safe/README.txt index d186193e20f..d1c51dc4cb7 100644 --- a/tests/kernel/mem_safe/README.txt +++ b/tests/kernel/mem_safe/README.txt @@ -9,10 +9,10 @@ intended. Building and Running Project: -This nanokernel project outputs to the console. It can be built and executed +This project outputs to the console. It can be built and executed on QEMU as follows: - make qemu + make run --------------------------------------------------------------------------- diff --git a/tests/kernel/obj_tracing/src/main.c b/tests/kernel/obj_tracing/src/main.c index d263d30289a..65cb5847922 100644 --- a/tests/kernel/obj_tracing/src/main.c +++ b/tests/kernel/obj_tracing/src/main.c @@ -18,12 +18,6 @@ char __stack phil_stack[N_PHILOSOPHERS][STSIZE]; char __stack mon_stack[STSIZE]; struct k_sem forks[N_PHILOSOPHERS]; -/** - * - * @brief Nanokernel entry point - * - */ - int main(void) { int i; diff --git a/tests/kernel/workq/work_queue/README.txt b/tests/kernel/workq/work_queue/README.txt index 6c83cc7da2d..d94cf908044 100644 --- a/tests/kernel/workq/work_queue/README.txt +++ b/tests/kernel/workq/work_queue/README.txt @@ -8,10 +8,10 @@ A simple application verifying the workqueue API Building and Running Project: -This nanokernel project outputs to the console. It can be built and executed +This kernel project outputs to the console. It can be built and executed on QEMU as follows: - make qemu + make run -------------------------------------------------------------------------------- diff --git a/tests/kernel/workq/work_queue/src/main.c b/tests/kernel/workq/work_queue/src/main.c index f60b3a55ea1..750a9ce3edd 100644 --- a/tests/kernel/workq/work_queue/src/main.c +++ b/tests/kernel/workq/work_queue/src/main.c @@ -7,7 +7,6 @@ #include #include -#include #include #include #include