Eliminate cputype.h and its arch-specific derivatives
Since cputype.h no longer has any meaningful content it can be eliminated, along with the arch-specific files it incorporated. (This means that the arch-specific nanokernel public APIs are now referenced only via cpu.h and its derivatives.) Change-Id: I7f35b6c3c6c092d61c372ff85d73e49414474938 Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
This commit is contained in:
Allan Stephens
Anas Nashif
parent
bb9ab0322e
commit
f547a5b7b8
|
|
@ -44,11 +44,6 @@ included by the nanokernel interface architecture-abstraction header
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifndef _ASMLANGUAGE
|
||||
#include <nanokernel.h>
|
||||
#include <cputype.h>
|
||||
#endif
|
||||
|
||||
/* APIs need to support non-byte addressible architectures */
|
||||
|
||||
#define OCTET_TO_SIZEOFUNIT(X) (X)
|
||||
|
|
|
|||
|
|
@ -1,57 +0,0 @@
|
|||
/* cpu.h - ARC specific definitions for cputype.h */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2013-2015 Wind River Systems, Inc.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1) Redistributions of source code must retain the above copyright notice,
|
||||
* this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2) Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* 3) Neither the name of Wind River Systems nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software without
|
||||
* specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/*
|
||||
DESCRIPTION
|
||||
This file is included by cputype.h when the VXMICRO_ARCH_arc macro is
|
||||
defined, i.e. whenever a build for the ARC architecture is being performed.
|
||||
This file shall only contain the CPU/compiler specific
|
||||
definitions that are necessary to build the EMBEDDED kernel library.
|
||||
*/
|
||||
|
||||
#ifndef _ARC_CPU__H_
|
||||
#define _ARC_CPU__H_
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <stdint.h>
|
||||
#include <toolchain.h>
|
||||
#include <misc/util.h>
|
||||
#include <drivers/system_timer.h> /* timer_driver() needed by kernel_main.c */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _ARC_CPU__H_ */
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
/* cpu.h - ARM specific definitions for cputype.h */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2013-2015 Wind River Systems, Inc.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1) Redistributions of source code must retain the above copyright notice,
|
||||
* this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2) Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* 3) Neither the name of Wind River Systems nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software without
|
||||
* specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/*
|
||||
DESCRIPTION
|
||||
This file is included by cputype.h when the VXMICRO_ARCH_arm macro is
|
||||
defined, i.e. whenever a build for the ARM architecture is being performed.
|
||||
This file shall only contain the CPU/compiler specific
|
||||
definitions that are necessary to build the EMBEDDED kernel library.
|
||||
*/
|
||||
|
||||
#ifndef _ARM_CPU__H_
|
||||
#define _ARM_CPU__H_
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <stdint.h>
|
||||
#include <toolchain.h>
|
||||
#include <misc/util.h>
|
||||
#include <drivers/system_timer.h> /* timer_driver() needed by kernel_main.c */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _ARM_CPU__H_ */
|
||||
|
|
@ -44,11 +44,6 @@ included by the nanokernel interface architecture-abstraction header
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifndef _ASMLANGUAGE
|
||||
#include <nanokernel.h>
|
||||
#include <cputype.h>
|
||||
#endif
|
||||
|
||||
/* APIs need to support non-byte addressible architectures */
|
||||
|
||||
#define OCTET_TO_SIZEOFUNIT(X) (X)
|
||||
|
|
|
|||
|
|
@ -1,60 +0,0 @@
|
|||
/* Intelprc.h - IA-32 specific definitions for cputype.h */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2010-2015 Wind River Systems, Inc.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1) Redistributions of source code must retain the above copyright notice,
|
||||
* this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2) Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* 3) Neither the name of Wind River Systems nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software without
|
||||
* specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/*
|
||||
DESCRIPTION
|
||||
This file is included by cputype.h when the VXMICRO_ARCH_x86 macro is defined,
|
||||
i.e. whenever a build for the IA-32 architecture is being performed. This
|
||||
file shall only contain the CPU/compiler specific definitions that are
|
||||
necessary to build the EMBEDDED kernel library.
|
||||
*/
|
||||
|
||||
#ifndef _INTELPRC_H
|
||||
#define _INTELPRC_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
#include <stdint.h>
|
||||
#include <toolchain.h>
|
||||
#include <misc/util.h>
|
||||
#include <arch/x86/addr_types.h>
|
||||
#include <arch/x86/asm_inline.h>
|
||||
#include <drivers/system_timer.h> /* timer_driver() needed by kernel_main.c */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _INTELPRC_H */
|
||||
|
|
@ -39,10 +39,8 @@ by the generic nanokernel interface header (nanokernel.h)
|
|||
#ifndef _ARCH_IFACE_H
|
||||
#define _ARCH_IFACE_H
|
||||
|
||||
/* WARNING: must include nanokernel.h before this file */
|
||||
|
||||
#ifndef _ASMLANGUAGE
|
||||
#include <arch/x86/Intelprc.h>
|
||||
#include <arch/x86/asm_inline.h>
|
||||
#endif
|
||||
|
||||
/* APIs need to support non-byte addressible architectures */
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
/* cputype.h */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1997-2014, Wind River Systems, Inc.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1) Redistributions of source code must retain the above copyright notice,
|
||||
* this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2) Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* 3) Neither the name of Wind River Systems nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software without
|
||||
* specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/* This file shall ONLY contain the CPU-core/compiler specific substitutes */
|
||||
/* that are necessary to build the EMBEDDED kernel library. */
|
||||
|
||||
#ifndef _CPUTYPE_H
|
||||
#define _CPUTYPE_H
|
||||
|
||||
#if defined(VXMICRO_ARCH_x86)
|
||||
#include <arch/x86/Intelprc.h>
|
||||
#elif defined(VXMICRO_ARCH_arm)
|
||||
#include <arch/arm/ARMprc.h>
|
||||
#elif defined(VXMICRO_ARCH_arc)
|
||||
#include <arch/arc/arcprc.h>
|
||||
#else
|
||||
#error "Unknown VXMICRO_ARCH type"
|
||||
#endif
|
||||
|
||||
#endif /* _CPUTYPE_H */
|
||||
|
|
@ -237,6 +237,5 @@ extern uint32_t nano_tick_delta_32(int64_t *reftime);
|
|||
/* architecture-specific nanokernel public APIs */
|
||||
|
||||
#include <arch/cpu.h>
|
||||
#include <cputype.h>
|
||||
|
||||
#endif /* __NANOKERNEL_H__ */
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ task, depending on how the kernel is configured.
|
|||
#include <toolchain.h>
|
||||
#include <sections.h>
|
||||
#include <microkernel.h>
|
||||
#include <drivers/system_timer.h>
|
||||
|
||||
#if defined(CONFIG_WORKLOAD_MONITOR)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue