michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Eliminate VxMicro branding in kernel code

Browse source 
Eliminates references to the obsolete OS name. In most cases the
name is simply removed, as it isn't necessary.

Change-Id: I32f9e7390e436aec008a9454b72657e129d65152
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
This commit is contained in:
Allan Stephens 2015-06-05 10:19:43 -04:00 • committed by Anas Nashif
commit 5189844df5
39 changed files with 85 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/arc/core/irq_lock.s
View file

@ -54,14 +54,14 @@
* interrupts or to inspect or manipulate the contents of the source register. * interrupts or to inspect or manipulate the contents of the source register.
* *
* WARNINGS * WARNINGS
* Invoking a VxMicro routine with interrupts locked may result in * Invoking a kernel routine with interrupts locked may result in
* interrupts being re-enabled for an unspecified period of time. If the * interrupts being re-enabled for an unspecified period of time. If the
* called routine blocks, interrupts will be re-enabled while another * called routine blocks, interrupts will be re-enabled while another
* context executes, or while the system is idle. * context executes, or while the system is idle.
* *
* The "interrupt disable state" is an attribute of a context. Thus, if a * The "interrupt disable state" is an attribute of a context. Thus, if a
* fiber or task disables interrupts and subsequently invokes a VxMicro * fiber or task disables interrupts and subsequently invokes a kernel
* system routine that causes the calling context to block, the interrupt * routine that causes the calling context to block, the interrupt
* disable state will be restored when the context is later rescheduled * disable state will be restored when the context is later rescheduled
* for execution. * for execution.
* *

2
arch/arc/timer/arcv2_timer0.c
View file

@ -32,7 +32,7 @@
/* /*
DESCRIPTION DESCRIPTION
This module implements a VxMicro device driver for the ARCv2 processor timer 0 This module implements a kernel device driver for the ARCv2 processor timer 0
and provides the standard "system clock driver" interfaces. and provides the standard "system clock driver" interfaces.
\INTERNAL IMPLEMENTATION DETAILS \INTERNAL IMPLEMENTATION DETAILS

2
arch/arm/core/basepri.s
View file

@ -34,7 +34,7 @@
DESCRIPTION DESCRIPTION
Provide irq_lock() and irq_unlock() via the BASEPRI register. This Provide irq_lock() and irq_unlock() via the BASEPRI register. This
allows locking up to a certain interrupt priority. VxMicro locks out priorities allows locking up to a certain interrupt priority. Kernel locks out priorities
2 and lower (higher numbered priorities), in essence leaving priorities 0 and 1 2 and lower (higher numbered priorities), in essence leaving priorities 0 and 1
unlocked. This achieves two purposes: unlocked. This achieves two purposes:

2
arch/arm/core/exc_exit.s
View file

@ -66,7 +66,7 @@ GDATA(_nanokernel)
* _IntExit - kernel housekeeping when exiting interrupt handler installed * _IntExit - kernel housekeeping when exiting interrupt handler installed
* directly in vector table * directly in vector table
* *
* VxMicro allows installing interrupt handlers (ISRs) directly into the vector * Kernel allows installing interrupt handlers (ISRs) directly into the vector
* table to get the lowest interrupt latency possible. This allows the ISR to be * table to get the lowest interrupt latency possible. This allows the ISR to be
* invoked directly without going through a software interrupt table. However, * invoked directly without going through a software interrupt table. However,
* upon exiting the ISR, some kernel work must still be performed, namely * upon exiting the ISR, some kernel work must still be performed, namely

4
arch/arm/core/gdb_stub.s
View file

@ -134,8 +134,8 @@ SECTION_FUNC(TEXT, _GdbStubExcExit)
* _irq_vector_table_entry_with_gdb_stub - stub for ISRs installed directly in * _irq_vector_table_entry_with_gdb_stub - stub for ISRs installed directly in
* vector table * vector table
* *
* VxMicro on Cortex-M3/4 allows users to configure the kernel such that * The kernel on Cortex-M3/4 can be configured so that ISRs
* ISRs are installed directly in the vector table for maximum efficiency. * are installed directly in the vector table for maximum efficiency.
* *
* When OS-awareness is enabled, a stub must be inserted to invoke * When OS-awareness is enabled, a stub must be inserted to invoke
* _GdbStubExcEntry() before the user ISR runs, to save the current task's * _GdbStubExcEntry() before the user ISR runs, to save the current task's

6
arch/arm/timer/systick.c
View file

@ -32,8 +32,8 @@
/* /*
DESCRIPTION DESCRIPTION
This module implements the VxMicro's CORTEX-M3 ARM's systick device driver. This module implements the kernel's CORTEX-M3 ARM's systick device driver.
It provides the standard VxMicro "system clock driver" interfaces. It provides the standard kernel "system clock driver" interfaces.
The driver utilizes systick to provide kernel ticks. The driver utilizes systick to provide kernel ticks.
@ -659,7 +659,7 @@ void timer_driver(int priority /* priority parameter is ignored by this driver
* timer_read - read the BSP timer hardware * timer_read - read the BSP timer hardware
* *
* This routine returns the current time in terms of timer hardware clock cycles. * This routine returns the current time in terms of timer hardware clock cycles.
* Some VxMicro facilities (e.g. benchmarking code) directly call timer_read() * Some kernel facilities (e.g. benchmarking code) directly call timer_read()
* instead of utilizing the 'timer_read_fptr' function pointer. * instead of utilizing the 'timer_read_fptr' function pointer.
* *
* RETURNS: up counter of elapsed clock cycles * RETURNS: up counter of elapsed clock cycles

12
arch/x86/bsp/crt0.s
View file

@ -31,7 +31,7 @@
*/ */
/* /*
DESCRIPTION DESCRIPTION
This module contains the initial code executed by the VxMicro ELF image This module contains the initial code executed by the Zephyr OS ELF image
after having been loaded into RAM. after having been loaded into RAM.
INTERNAL INTERNAL
@ -102,7 +102,7 @@ __start:
#endif #endif
/* /*
* Ensure interrupts are disabled. Interrupts are enabled when * Ensure interrupts are disabled. Interrupts are enabled when
* the first VxMicro thread context switch occurs. * the first kernel thread context switch occurs.
*/ */
cli cli
@ -247,7 +247,7 @@ SECTION_FUNC(TEXT_START, __start)
/* /*
* Ensure interrupts are disabled. Interrupts are enabled when * Ensure interrupts are disabled. Interrupts are enabled when
* the first VxMicro thread context switch occurs. * the first kernel thread context switch occurs.
*/ */
cli cli
@ -467,7 +467,7 @@ memInitDone:
/* /*
* Set the stack pointer to the area used for the interrupt stack. * Set the stack pointer to the area used for the interrupt stack.
* Note this stack is only used during the execution of __start() and * Note this stack is only used during the execution of __start() and
* _Cstart(), i.e. only until the multi-tasking VxMicro kernel is * _Cstart(), i.e. only until the multi-tasking kernel is
* initialized. The dual-purposing of this area of memory is safe since * initialized. The dual-purposing of this area of memory is safe since
* interrupts are disabled until the first context switch. * interrupts are disabled until the first context switch.
*/ */
@ -500,7 +500,7 @@ memInitDone:
pushl $_Cstart pushl $_Cstart
call _AdvIdleStart call _AdvIdleStart
#else #else
/* Jump to C portion of VxMicro kernel initialization and never return */ /* Jump to C portion of kernel initialization and never return */
jmp _Cstart jmp _Cstart
@ -577,7 +577,7 @@ _GdtRom:
/* /*
* The following 3 GDT entries implement the so-called "basic * The following 3 GDT entries implement the so-called "basic
* flat model", i.e. a single code segment descriptor and a single * flat model", i.e. a single code segment descriptor and a single
* data segment descriptor such that VxMicro has access to a continuous, * data segment descriptor, giving the kernel access to a continuous,
* unsegmented address space. Both segment descriptors map the entire * unsegmented address space. Both segment descriptors map the entire
* linear address space (i.e. 0 to 4 GB-1), thus the segmentation * linear address space (i.e. 0 to 4 GB-1), thus the segmentation
* mechanism will never generate "out of limit memory reference" * mechanism will never generate "out of limit memory reference"

2
arch/x86/core/cpuhalt.s
View file

@ -1,4 +1,4 @@
/* cpuhalt.s - VxMicro CPU power management code for IA-32 */ /* cpuhalt.s - CPU power management code for IA-32 */
/* /*
* Copyright (c) 2011-2014 Wind River Systems, Inc. * Copyright (c) 2011-2014 Wind River Systems, Inc.

4
arch/x86/core/excconnect.c
View file

@ -1,4 +1,4 @@
/* excconnect.c - VxMicro exception management support for IA-32 arch */ /* excconnect.c - exception management support for IA-32 arch */
/* /*
* Copyright (c) 2010-2014 Wind River Systems, Inc. * Copyright (c) 2010-2014 Wind River Systems, Inc.
@ -33,7 +33,7 @@
/* /*
DESCRIPTION DESCRIPTION
This module provides routines to manage exceptions (synchronous interrupts) This module provides routines to manage exceptions (synchronous interrupts)
in VxMicro on the IA-32 architecture. on the IA-32 architecture.
This module provides the public routine nanoCpuExcConnect(). This module provides the public routine nanoCpuExcConnect().

12
arch/x86/core/excstub.s
View file

@ -1,4 +1,4 @@
/* excstub.s - VxMicro exception management support for IA-32 architecture */ /* excstub.s - exception management support for IA-32 architecture */
/* /*
* Copyright (c) 2011-2014 Wind River Systems, Inc. * Copyright (c) 2011-2014 Wind River Systems, Inc.
@ -33,7 +33,7 @@
/* /*
DESCRIPTION DESCRIPTION
This module implements assembly routines to manage exceptions (synchronous This module implements assembly routines to manage exceptions (synchronous
interrupts) in VxMicro on the Intel IA-32 architecture. More specifically, interrupts) on the Intel IA-32 architecture. More specifically,
exceptions are implemented in this module. The stubs are invoked when entering exceptions are implemented in this module. The stubs are invoked when entering
and exiting a C exception handler. and exiting a C exception handler.
*/ */
@ -59,10 +59,10 @@ and exiting a C exception handler.
/******************************************************************************* /*******************************************************************************
* *
* _ExcEnt - inform the VxMicro kernel of an exception * _ExcEnt - inform the kernel of an exception
* *
* This function is called from the exception stub created by nanoCpuExcConnect() * This function is called from the exception stub created by nanoCpuExcConnect()
* to inform the VxMicro kernel of an exception. This routine currently does * to inform the kernel of an exception. This routine currently does
* _not_ increment a context/interrupt specific exception count. Also, * _not_ increment a context/interrupt specific exception count. Also,
* execution of the exception handler occurs on the current stack, i.e. * execution of the exception handler occurs on the current stack, i.e.
* _ExcEnt() does not switch to another stack. The volatile integer * _ExcEnt() does not switch to another stack. The volatile integer
@ -217,10 +217,10 @@ BRANCH_LABEL(allDone)
/******************************************************************************* /*******************************************************************************
* *
* _ExcExit - inform the VxMicro kernel of an exception exit * _ExcExit - inform the kernel of an exception exit
* *
* This function is called from the exception stub created by nanoCpuExcConnect() * This function is called from the exception stub created by nanoCpuExcConnect()
* to inform the VxMicro kernel that the processing of an exception has * to inform the kernel that the processing of an exception has
* completed. This routine restores the volatile integer registers and * completed. This routine restores the volatile integer registers and
* then control is returned back to the interrupted context or ISR. * then control is returned back to the interrupted context or ISR.
* *

2
arch/x86/core/intboiexit.s
View file

@ -1,4 +1,4 @@
/* intboiexit.s - VxMicro spurious interrupt support for IA-32 architecture */ /* intboiexit.s - spurious interrupt support for IA-32 architecture */
/* /*
* Copyright (c) 2010-2014 Wind River Systems, Inc. * Copyright (c) 2010-2014 Wind River Systems, Inc.

4
arch/x86/core/intconnect.c
View file

@ -1,4 +1,4 @@
/* intconnect.c - VxMicro interrupt management support for IA-32 arch */ /* intconnect.c - interrupt management support for IA-32 arch */
/* /*
* Copyright (c) 2010-2014 Wind River Systems, Inc. * Copyright (c) 2010-2014 Wind River Systems, Inc.
@ -32,7 +32,7 @@
/* /*
DESCRIPTION DESCRIPTION
This module provides routines to manage asynchronous interrupts in VxMicro This module provides routines to manage asynchronous interrupts
on the IA-32 architecture. on the IA-32 architecture.
This module provides the public routine irq_connect(), the private This module provides the public routine irq_connect(), the private

2
arch/x86/core/inthndlset.c
View file

@ -1,4 +1,4 @@
/* inthndlset.c - VxMicro interrupt management support for IA-32 arch */ /* inthndlset.c - interrupt management support for IA-32 arch */
/* /*
* Copyright (c) 2011-2014 Wind River Systems, Inc. * Copyright (c) 2011-2014 Wind River Systems, Inc.

16
arch/x86/core/intstub.s
View file

@ -1,4 +1,4 @@
/* intstub.s - VxMicro interrupt management support for IA-32 architecture */ /* intstub.s - interrupt management support for IA-32 architecture */
/* /*
* Copyright (c) 2010-2014 Wind River Systems, Inc. * Copyright (c) 2010-2014 Wind River Systems, Inc.
@ -32,7 +32,7 @@
/* /*
DESCRIPTION DESCRIPTION
This module implements assembly routines to manage interrupts in VxMicro on This module implements assembly routines to manage interrupts on
the Intel IA-32 architecture. More specifically, the interrupt (asynchronous the Intel IA-32 architecture. More specifically, the interrupt (asynchronous
exception) stubs are implemented in this module. The stubs are invoked when exception) stubs are implemented in this module. The stubs are invoked when
entering and exiting a C interrupt handler. entering and exiting a C interrupt handler.
@ -76,10 +76,10 @@ entering and exiting a C interrupt handler.
#endif #endif
/******************************************************************************* /*******************************************************************************
* *
* _IntEnt - inform the VxMicro kernel of an interrupt * _IntEnt - inform the kernel of an interrupt
* *
* This function is called from the interrupt stub created by irq_connect() * This function is called from the interrupt stub created by irq_connect()
* to inform the VxMicro kernel of an interrupt. This routine increments * to inform the kernel of an interrupt. This routine increments
* _nanokernel.nested (to support interrupt nesting), switches to the * _nanokernel.nested (to support interrupt nesting), switches to the
* base of the interrupt stack, if not already on the interrupt stack, and then * base of the interrupt stack, if not already on the interrupt stack, and then
* saves the volatile integer registers onto the stack. Finally, control is * saves the volatile integer registers onto the stack. Finally, control is
@ -242,10 +242,10 @@ BRANCH_LABEL(_HandleIdle)
/******************************************************************************* /*******************************************************************************
* *
* _IntExit - inform the VxMicro kernel of an interrupt exit * _IntExit - inform the kernel of an interrupt exit
* *
* This function is called from the interrupt stub created by irq_connect() * This function is called from the interrupt stub created by irq_connect()
* to inform the VxMicro kernel that the processing of an interrupt has * to inform the kernel that the processing of an interrupt has
* completed. This routine decrements _nanokernel.nested (to support interrupt * completed. This routine decrements _nanokernel.nested (to support interrupt
* nesting), restores the volatile integer registers, and then switches * nesting), restores the volatile integer registers, and then switches
* back to the interrupted context's stack, if this isn't a nested interrupt. * back to the interrupted context's stack, if this isn't a nested interrupt.
@ -476,14 +476,14 @@ BRANCH_LABEL(callFatalHandler)
* interrupts or to inspect or manipulate the contents of the source register. * interrupts or to inspect or manipulate the contents of the source register.
* *
* WARNINGS * WARNINGS
* Invoking a VxMicro system routine with interrupts locked may result in * Invoking a kernel routine with interrupts locked may result in
* interrupts being re-enabled for an unspecified period of time. If the * interrupts being re-enabled for an unspecified period of time. If the
* called routine blocks, interrupts will be re-enabled while another * called routine blocks, interrupts will be re-enabled while another
* context executes, or while the system is idle. * context executes, or while the system is idle.
* *
* The "interrupt disable state" is an attribute of a context, i.e. it's part * The "interrupt disable state" is an attribute of a context, i.e. it's part
* of the context context. Thus, if a context disables interrupts and * of the context context. Thus, if a context disables interrupts and
* subsequently invokes a VxMicro system routine that causes the calling context * subsequently invokes a kernel routine that causes the calling context
* to block, the interrupt disable state will be restored when the context is * to block, the interrupt disable state will be restored when the context is
* later rescheduled for execution. * later rescheduled for execution.
* *

2
arch/x86/core/nanoatomic.s
View file

@ -1,4 +1,4 @@
/* nanoatomic.s - VxMicro nanokernel atomic operators for IA-32 */ /* nanoatomic.s - nanokernel atomic operators for IA-32 */
/* /*
* Copyright (c) 2011-2014 Wind River Systems, Inc. * Copyright (c) 2011-2014 Wind River Systems, Inc.

2
arch/x86/core/nanocontext.c
View file

@ -1,4 +1,4 @@
/* nanocontext.c - VxMicro nanokernel context support primitives */ /* nanocontext.c - nanokernel context support primitives */
/* /*
* Copyright (c) 2010-2015 Wind River Systems, Inc. * Copyright (c) 2010-2015 Wind River Systems, Inc.

10
arch/x86/core/nanofloat.c
View file

@ -1,4 +1,4 @@
/* nanofloat.c - VxMicro floating point resource sharing routines */ /* nanofloat.c - floating point resource sharing routines */
/* /*
* Copyright (c) 2010-2014 Wind River Systems, Inc. * Copyright (c) 2010-2014 Wind River Systems, Inc.
@ -57,17 +57,17 @@ The 'options' parameter is used to specify what non-integer capabilities are
being used. The same options accepted by fiber_fiber_start() are used in the being used. The same options accepted by fiber_fiber_start() are used in the
aforementioned APIs, namely USE_FP and USE_SSE. aforementioned APIs, namely USE_FP and USE_SSE.
If the VxMicro nanokernel has been built with support for automatic enabling If the nanokernel has been built with support for automatic enabling
of floating point resource sharing (CONFIG_AUTOMATIC_FP_ENABLING) the of floating point resource sharing (CONFIG_AUTOMATIC_FP_ENABLING) the
system automatically enables sharing for any non-enabled task or fiber as soon system automatically enables sharing for any non-enabled task or fiber as soon
as it begins using floating point instructions. (Note: The task or fiber must as it begins using floating point instructions. (Note: The task or fiber must
have enough room available on its stack to allow floating point state info have enough room available on its stack to allow floating point state info
to be saved, otherwise stack corruption will occur.) to be saved, otherwise stack corruption will occur.)
If the VxMicro nanokernel has been built without SSE instruction support If the nanokernel has been built without SSE instruction support
(CONFIG_SSE), the system treats USE_SSE as if it was USE_FP. (CONFIG_SSE), the system treats USE_SSE as if it was USE_FP.
If the VxMicro nanokernel has been built without floating point resource If the nanokernel has been built without floating point resource
sharing support (CONFIG_FP_SHARING), the aforementioned APIs and sharing support (CONFIG_FP_SHARING), the aforementioned APIs and
capabilities do not exist. capabilities do not exist.
@ -78,7 +78,7 @@ fiber uses the FPU the FP registers won't change when the FP-capable task or
fiber isn't executing, meaning there is no need to save the registers. fiber isn't executing, meaning there is no need to save the registers.
WARNING WARNING
The use of floating point instructions by ISRs is not supported by VxMicro. The use of floating point instructions by ISRs is not supported by the kernel.
INTERNAL INTERNAL
If automatic enabling of floating point resource sharing _is not_ configured If automatic enabling of floating point resource sharing _is not_ configured

2
arch/x86/core/offsets/offsets.c
View file

@ -1,4 +1,4 @@
/* offsets.c - VxMicro nanokernel structure member offset definition file */ /* offsets.c - nanokernel structure member offset definition file */
/* /*
* Copyright (c) 2010-2014 Wind River Systems, Inc. * Copyright (c) 2010-2014 Wind River Systems, Inc.

2
arch/x86/core/swap.s
View file

@ -1,4 +1,4 @@
/* swap.s - VxMicro nanokernel swapper code for IA-32 */ /* swap.s - nanokernel swapper code for IA-32 */
/* /*
* Copyright (c) 2010-2014 Wind River Systems, Inc. * Copyright (c) 2010-2014 Wind River Systems, Inc.

4
arch/x86/include/advidle.h
View file

@ -67,9 +67,9 @@ extern int _AdvIdleCheckSleep(void);
*/ */
extern void _AdvIdleStart( extern void _AdvIdleStart(
void (*_Cstart)(void), /* addr of VxMicro _Cstart function */ void (*_Cstart)(void), /* addr of _Cstart function */
void *_gdt, /* addr of global descriptor table in RAM */ void *_gdt, /* addr of global descriptor table in RAM */
void *_GlobalTss /* addr of VxMicro TSS descriptor */ void *_GlobalTss /* addr of TSS descriptor */
); );
/* /*

2
arch/x86/timer/hpet.c
View file

@ -32,7 +32,7 @@
/* /*
DESCRIPTION DESCRIPTION
This module implements a VxMicro device driver for the Intel High Precision This module implements a kernel device driver for the Intel High Precision
Event Timer (HPET) device, and provides the standard "system clock driver" Event Timer (HPET) device, and provides the standard "system clock driver"
interfaces. interfaces.

2
arch/x86/timer/loApicTimer.c
View file

@ -32,7 +32,7 @@
/* /*
DESCRIPTION DESCRIPTION
This module implements a VxMicro device driver for the Intel local APIC This module implements a kernel device driver for the Intel local APIC
device, and provides the standard "system clock driver" interfaces. device, and provides the standard "system clock driver" interfaces.
This library contains routines for the timer in the Intel local APIC/xAPIC This library contains routines for the timer in the Intel local APIC/xAPIC
(Advanced Programmable Interrupt Controller) in P6 (PentiumPro, II, III) (Advanced Programmable Interrupt Controller) in P6 (PentiumPro, II, III)

4
drivers/interrupt_controller/i8259.c
View file

@ -32,7 +32,7 @@
/* /*
DESCRIPTION DESCRIPTION
This module implements a VxMicro device driver for the Intel 8259A PIC This module implements a kernel device driver for the Intel 8259A PIC
(Programmable Interrupt Controller). In summary, the i8259A supports (Programmable Interrupt Controller). In summary, the i8259A supports
up to 8 vectored priority interrupts. Cascading up to 8 PICs allows support up to 8 vectored priority interrupts. Cascading up to 8 PICs allows support
of up to 64 vectored priority interrupts. This device driver assumes two of up to 64 vectored priority interrupts. This device driver assumes two
@ -246,7 +246,7 @@ void _i8259_eoi_slave(unsigned int irq /* IRQ number to
* This routine enables or disables a specified PIC interrupt input line. To * This routine enables or disables a specified PIC interrupt input line. To
* enable an interrupt input line, the parameter <enable> must be non-zero. * enable an interrupt input line, the parameter <enable> must be non-zero.
* *
* The VxMicro nanokernel exports the irq_enable() and irq_disable() * The nanokernel exports the irq_enable() and irq_disable()
* APIs (mapped to _i8259_irq_enable() and _i8259_irq_disable(), respectively). * APIs (mapped to _i8259_irq_enable() and _i8259_irq_disable(), respectively).
* This function is called by _i8259_irq_enable() and _i8259_irq_disable() to * This function is called by _i8259_irq_enable() and _i8259_irq_disable() to
* perform the actual enabling/disabling of an IRQ to minimize footprint. * perform the actual enabling/disabling of an IRQ to minimize footprint.

2
drivers/timer/i8253.c
View file

@ -32,7 +32,7 @@
/* /*
DESCRIPTION DESCRIPTION
This module implements a VxMicro device driver for the Intel 8253 PIT This module implements a kernel device driver for the Intel 8253 PIT
(Programmable Interval Timer) device, and provides the standard "system (Programmable Interval Timer) device, and provides the standard "system
clock driver" interfaces. clock driver" interfaces.

6
include/arch/arm/CortexM/asm_inline_gcc.h
View file

@ -123,14 +123,14 @@ static ALWAYS_INLINE unsigned int find_first_set_inline(unsigned int op)
* interrupts or to inspect or manipulate the contents of the source register. * interrupts or to inspect or manipulate the contents of the source register.
* *
* WARNINGS * WARNINGS
* Invoking a VxMicro routine with interrupts locked may result in * Invoking a kernel routine with interrupts locked may result in
* interrupts being re-enabled for an unspecified period of time. If the * interrupts being re-enabled for an unspecified period of time. If the
* called routine blocks, interrupts will be re-enabled while another * called routine blocks, interrupts will be re-enabled while another
* context executes, or while the system is idle. * context executes, or while the system is idle.
* *
* The "interrupt disable state" is an attribute of a context. Thus, if a * The "interrupt disable state" is an attribute of a context. Thus, if a
* fiber or task disables interrupts and subsequently invokes a VxMicro * fiber or task disables interrupts and subsequently invokes a kernel
* system routine that causes the calling context to block, the interrupt * routine that causes the calling context to block, the interrupt
* disable state will be restored when the context is later rescheduled * disable state will be restored when the context is later rescheduled
* for execution. * for execution.
* *

2
include/arch/arm/CortexM/nvic.h
View file

@ -36,7 +36,7 @@ Provide an interface to the Nested Vectored Interrupt Controller found on
ARM Cortex-M processors. ARM Cortex-M processors.
The API does not account for all possible usages of the NVIC, only the The API does not account for all possible usages of the NVIC, only the
functionalities needed by the VxMicro kernel. functionalities needed by the kernel.
The same effect can be achieved by directly writing in the registers of the The same effect can be achieved by directly writing in the registers of the
NVIC, with the layout available from scs.h, using the __scs.nvic data NVIC, with the layout available from scs.h, using the __scs.nvic data

2
include/arch/arm/CortexM/scb.h
View file

@ -36,7 +36,7 @@ Provide an interface to the System Control Block found on ARM Cortex-M
processors. processors.
The API does not account for all possible usages of the SCB, only the The API does not account for all possible usages of the SCB, only the
functionalities needed by the VxMicro kernel. It does not contain NVIC functionalities needed by the kernel. It does not contain NVIC
functionalities either: these can be found in nvic.h. MPU functionalities functionalities either: these can be found in nvic.h. MPU functionalities
are not implemented. are not implemented.

2
include/arch/arm/CortexM/scs.h
View file

@ -51,7 +51,7 @@ and
documents from ARM. documents from ARM.
The API does not account for all possible usages of the SCS, only the The API does not account for all possible usages of the SCS, only the
functionalities needed by the VxMicro kernel. It does not contain NVIC and functionalities needed by the kernel. It does not contain NVIC and
SCB functionalities either: these can be found in nvic.h and scb.h. SCB functionalities either: these can be found in nvic.h and scb.h.
MPU functionalities are not implemented. MPU functionalities are not implemented.

6
include/arch/x86/arch.h
View file

@ -253,14 +253,14 @@ void _int_latency_stop(void);
* interrupts or to inspect or manipulate the contents of the source register. * interrupts or to inspect or manipulate the contents of the source register.
* *
* WARNINGS * WARNINGS
* Invoking a VxMicro routine with interrupts locked may result in * Invoking a kernel routine with interrupts locked may result in
* interrupts being re-enabled for an unspecified period of time. If the * interrupts being re-enabled for an unspecified period of time. If the
* called routine blocks, interrupts will be re-enabled while another * called routine blocks, interrupts will be re-enabled while another
* context executes, or while the system is idle. * context executes, or while the system is idle.
* *
* The "interrupt disable state" is an attribute of a context. Thus, if a * The "interrupt disable state" is an attribute of a context. Thus, if a
* fiber or task disables interrupts and subsequently invokes a VxMicro * fiber or task disables interrupts and subsequently invokes a kernel
* system routine that causes the calling context to block, the interrupt * routine that causes the calling context to block, the interrupt
* disable state will be restored when the context is later rescheduled * disable state will be restored when the context is later rescheduled
* for execution. * for execution.
* *

6
include/arch/x86/asm_inline_gcc.h
View file

@ -58,14 +58,14 @@
* interrupts or to inspect or manipulate the contents of the source register. * interrupts or to inspect or manipulate the contents of the source register.
* *
* WARNINGS * WARNINGS
* Invoking a VxMicro routine with interrupts locked may result in * Invoking a kernel routine with interrupts locked may result in
* interrupts being re-enabled for an unspecified period of time. If the * interrupts being re-enabled for an unspecified period of time. If the
* called routine blocks, interrupts will be re-enabled while another * called routine blocks, interrupts will be re-enabled while another
* context executes, or while the system is idle. * context executes, or while the system is idle.
* *
* The "interrupt disable state" is an attribute of a context. Thus, if a * The "interrupt disable state" is an attribute of a context. Thus, if a
* fiber or task disables interrupts and subsequently invokes a VxMicro * fiber or task disables interrupts and subsequently invokes a kernel
* system routine that causes the calling context to block, the interrupt * routine that causes the calling context to block, the interrupt
* disable state will be restored when the context is later rescheduled * disable state will be restored when the context is later rescheduled
* for execution. * for execution.
* *

13
include/arch/x86/linker-common-sections.h
View file

@ -1,4 +1,4 @@
/* linker-common-sections.h - common linker sections in VxMicro */ /* linker-common-sections.h - common linker sections */
/* /*
* Copyright (c) 2013-2014 Wind River Systems, Inc. * Copyright (c) 2013-2014 Wind River Systems, Inc.
@ -32,11 +32,12 @@
/* /*
DESCRIPTION DESCRIPTION
This script defines where the various sections of a VxMicro image go in memory. This script defines the memory location of the various sections that make up
It is usable by most BSPs supported in VxMicro. This file is used by the linker. a Zephyr OS image. It is usable by most supported BSPs. This file is used
by the linker.
This script places the various sections of the image according to what feature This script places the various sections of the image according to what features
is used in VxMicro. are enabled by the kernel's configuration options.
For a build that does not use the execute in place (XIP) feature, the script For a build that does not use the execute in place (XIP) feature, the script
generates an image suitable for loading into and executing from RAM by placing generates an image suitable for loading into and executing from RAM by placing
@ -53,7 +54,7 @@ end of the RODATA section. At runtime, the DATA section is copied into the RAM
region so it can be accessed with read and write permission. region so it can be accessed with read and write permission.
Most symbols defined in the sections below are subject to be referenced in the Most symbols defined in the sections below are subject to be referenced in the
VxMicro image. If a symbol is used but not defined the linker will emit an Zephyr OS image. If a symbol is used but not defined the linker will emit an
undefined symbol error. undefined symbol error.
Please do not change the order of the section as the nanokernel expects this Please do not change the order of the section as the nanokernel expects this

2
include/microkernel.h
View file

@ -1,4 +1,4 @@
/* microkernel.h - public API for VxMicro microkernel */ /* microkernel.h - public API for microkernel */
/* /*
* Copyright (c) 1997-2015, Wind River Systems, Inc. * Copyright (c) 1997-2015, Wind River Systems, Inc.

2
include/nanokernel.h
View file

@ -1,4 +1,4 @@
/* nanokernel.h - public API for VxMicro nanokernel */ /* nanokernel.h - public API for nanokernel */
/* /*
* Copyright (c) 1997-2015, Wind River Systems, Inc. * Copyright (c) 1997-2015, Wind River Systems, Inc.

5
kernel/nanokernel/nano_fifo.c
View file

@ -32,9 +32,8 @@
/* /*
DESCRIPTION DESCRIPTION
This module provides the VxMicro nanokernel (aka system-level) 'fifo' This module provides the nanokernel FIFO object implementation, including
implementation. This module provides the backing implementation for the the following APIs:
following APIs:
nano_fifo_init nano_fifo_init
nano_fiber_fifo_put, nano_task_fifo_put, nano_isr_fifo_put nano_fiber_fifo_put, nano_task_fifo_put, nano_isr_fifo_put

2
kernel/nanokernel/nano_init.c
View file

@ -53,7 +53,7 @@ const char * const build_timestamp = BUILD_TIMESTAMP;
/* boot banner items */ /* boot banner items */
#define BOOT_BANNER "****** BOOTING VXMICRO ******" #define BOOT_BANNER "****** BOOTING ZEPHYR OS ******"
#if !defined(CONFIG_BOOT_BANNER) #if !defined(CONFIG_BOOT_BANNER)
#define PRINT_BOOT_BANNER() do { } while (0) #define PRINT_BOOT_BANNER() do { } while (0)

5
kernel/nanokernel/nano_lifo.c
View file

@ -32,9 +32,8 @@
/* /*
DESCRIPTION DESCRIPTION
This module provides the VxMicro nanokernel (aka system-level) 'lifo' This module provides the nanokernel LIFO object implementation, including
implementation. This module provides the backing implementation for the the following APIs:
following APIs:
nano_lifo_init nano_lifo_init
nano_fiber_lifo_put, nano_task_lifo_put, nano_isr_lifo_put nano_fiber_lifo_put, nano_task_lifo_put, nano_isr_lifo_put

5
kernel/nanokernel/nano_sema.c
View file

@ -32,9 +32,8 @@
/* /*
DESCRIPTION DESCRIPTION
This module provides the VxMicro nanokernel (aka system-level) 'sema' This module provides the nanokernel semaphore object implementation,
implementation. This module provides the backing implementation for the including the following APIs:
following APIs:
nano_sem_init nano_sem_init
nano_fiber_sem_give, nano_task_sem_give, nano_isr_sem_give nano_fiber_sem_give, nano_task_sem_give, nano_isr_sem_give

5
kernel/nanokernel/nano_stack.c
View file

@ -32,9 +32,8 @@
/* /*
DESCRIPTION DESCRIPTION
This module provides the VxMicro nanokernel (aka system-level) 'stack' This module provides the nanokernel stack object implementation, including
implementation. This module provides the backing implementation for the the following APIs:
following APIs:
nano_stack_init nano_stack_init
nano_fiber_stack_push, nano_task_stack_push, nano_isr_stack_push nano_fiber_stack_push, nano_task_stack_push, nano_isr_stack_push

2
kernel/nanokernel/nanometrics.c
View file

@ -35,7 +35,7 @@
#include <sections.h> #include <sections.h>
#ifdef CONFIG_BOOT_TIME_MEASUREMENT #ifdef CONFIG_BOOT_TIME_MEASUREMENT
uint64_t __noinit __start_tsc; /* timestamp when VxMicro starts */ uint64_t __noinit __start_tsc; /* timestamp when kernel starts */
uint64_t __noinit __main_tsc; /* timestamp when main() starts */ uint64_t __noinit __main_tsc; /* timestamp when main() starts */
uint64_t __noinit __idle_tsc; /* timestamp when CPU goes idle */ uint64_t __noinit __idle_tsc; /* timestamp when CPU goes idle */
#endif #endif