include: arch: move addr_types to common location

All architectures declare those variables the same way, no need to
define them per arch, instead put them in common. If someone deviates,
they can create their own header.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2019-06-02 21:44:42 -04:00
commit d647751bbc
9 changed files with 7 additions and 55 deletions

View file

@ -27,7 +27,7 @@
#include <arch/arc/v2/aux_regs.h> #include <arch/arc/v2/aux_regs.h>
#include <arch/arc/v2/arcv2_irq_unit.h> #include <arch/arc/v2/arcv2_irq_unit.h>
#include <arch/arc/v2/asm_inline.h> #include <arch/arc/v2/asm_inline.h>
#include <arch/arc/v2/addr_types.h> #include <arch/common/addr_types.h>
#include "v2/sys_io.h" #include "v2/sys_io.h"
#endif #endif

View file

@ -1,17 +0,0 @@
/*
* Copyright (c) 2015 Wind River Systems, Inc.
*
* SPDX-License-Identifier: Apache-2.0
*/
/* @file ARC-v2 address types (virtual, physical, etc) definitions */
#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_ADDR_TYPES_H_
#define ZEPHYR_INCLUDE_ARCH_ARC_V2_ADDR_TYPES_H_
#ifndef _ASMLANGUAGE
typedef unsigned int paddr_t;
typedef unsigned int vaddr_t;
#endif
#endif /* ZEPHYR_INCLUDE_ARCH_ARC_V2_ADDR_TYPES_H_ */

View file

@ -29,8 +29,8 @@
#include <arch/arm/cortex_m/misc.h> #include <arch/arm/cortex_m/misc.h>
#include <arch/arm/cortex_m/memory_map.h> #include <arch/arm/cortex_m/memory_map.h>
#include <arch/arm/cortex_m/asm_inline.h> #include <arch/arm/cortex_m/asm_inline.h>
#include <arch/arm/cortex_m/addr_types.h>
#include <arch/common/sys_io.h> #include <arch/common/sys_io.h>
#include <arch/common/addr_types.h>
#include <arch/common/ffs.h> #include <arch/common/ffs.h>
#include <arch/arm/cortex_m/nmi.h> #include <arch/arm/cortex_m/nmi.h>
#endif #endif

View file

@ -1,17 +0,0 @@
/*
* Copyright (c) 2015 Wind River Systems, Inc.
*
* SPDX-License-Identifier: Apache-2.0
*/
/* @file Cortex-M address types (virtual, physical, etc) definitions */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ADDR_TYPES_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ADDR_TYPES_H_
#ifndef _ASMLANGUAGE
typedef unsigned int paddr_t;
typedef unsigned int vaddr_t;
#endif
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_ADDR_TYPES_H_ */

View file

@ -9,7 +9,9 @@
#ifndef ZEPHYR_INCLUDE_ARCH_X86_ADDR_TYPES_H_ #ifndef ZEPHYR_INCLUDE_ARCH_X86_ADDR_TYPES_H_
#define ZEPHYR_INCLUDE_ARCH_X86_ADDR_TYPES_H_ #define ZEPHYR_INCLUDE_ARCH_X86_ADDR_TYPES_H_
#ifndef _ASMLANGUAGE
typedef unsigned int paddr_t; typedef unsigned int paddr_t;
typedef unsigned int vaddr_t; typedef unsigned int vaddr_t;
#endif
#endif /* ZEPHYR_INCLUDE_ARCH_X86_ADDR_TYPES_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_X86_ADDR_TYPES_H_ */

View file

@ -16,6 +16,7 @@
#include <system.h> #include <system.h>
#include <arch/nios2/asm_inline.h> #include <arch/nios2/asm_inline.h>
#include <arch/common/addr_types.h>
#include <generated_dts_board.h> #include <generated_dts_board.h>
#include "nios2.h" #include "nios2.h"
#include <arch/common/sys_io.h> #include <arch/common/sys_io.h>
@ -39,9 +40,6 @@ extern "C" {
#include <irq.h> #include <irq.h>
#include <sw_isr_table.h> #include <sw_isr_table.h>
/* physical/virtual address types required by the kernel */
typedef unsigned int paddr_t;
typedef unsigned int vaddr_t;
/** /**
* Configure a static interrupt. * Configure a static interrupt.

View file

@ -25,7 +25,7 @@
#ifndef _ASMLANGUAGE #ifndef _ASMLANGUAGE
#include <arch/x86/asm_inline.h> #include <arch/x86/asm_inline.h>
#include <arch/x86/addr_types.h> #include <arch/common/addr_types.h>
#include <arch/x86/segmentation.h> #include <arch/x86/segmentation.h>
#endif #endif

View file

@ -1,15 +0,0 @@
/*
* Copyright (c) 2016 Cadence Design Systems, Inc.
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_ARCH_XTENSA_ADDR_TYPES_H_
#define ZEPHYR_INCLUDE_ARCH_XTENSA_ADDR_TYPES_H_
#ifndef _ASMLANGUAGE
typedef unsigned int paddr_t;
typedef unsigned int vaddr_t;
#endif
#endif /* ZEPHYR_INCLUDE_ARCH_XTENSA_ADDR_TYPES_H_ */

View file

@ -27,6 +27,7 @@ extern "C" {
#include <sw_isr_table.h> #include <sw_isr_table.h>
#include <arch/xtensa/xtensa_irq.h> #include <arch/xtensa/xtensa_irq.h>
#include <xtensa/config/core.h> #include <xtensa/config/core.h>
#include <arch/common/addr_types.h>
#define STACK_ALIGN 16 #define STACK_ALIGN 16