arch: move arch_interface.h under zephyr/arch
arch_interface.h is for architecture and should not be under sys/. So move it under include/zephyr/arch/. Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
parent
f36570a357
commit
3664ed64c3
|
@ -21,7 +21,7 @@
|
||||||
#include <zephyr/arch/cpu.h>
|
#include <zephyr/arch/cpu.h>
|
||||||
#include <zephyr/drivers/interrupt_controller/gic.h>
|
#include <zephyr/drivers/interrupt_controller/gic.h>
|
||||||
#include <zephyr/drivers/pm_cpu_ops.h>
|
#include <zephyr/drivers/pm_cpu_ops.h>
|
||||||
#include <zephyr/sys/arch_interface.h>
|
#include <zephyr/arch/arch_interface.h>
|
||||||
#include <zephyr/sys/barrier.h>
|
#include <zephyr/sys/barrier.h>
|
||||||
#include <zephyr/irq.h>
|
#include <zephyr/irq.h>
|
||||||
#include "boot.h"
|
#include "boot.h"
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#include <kernel_internal.h>
|
#include <kernel_internal.h>
|
||||||
#include <zephyr/linker/linker-defs.h>
|
#include <zephyr/linker/linker-defs.h>
|
||||||
#include <pmp.h>
|
#include <pmp.h>
|
||||||
#include <zephyr/sys/arch_interface.h>
|
#include <zephyr/arch/arch_interface.h>
|
||||||
#include <zephyr/arch/riscv/csr.h>
|
#include <zephyr/arch/riscv/csr.h>
|
||||||
|
|
||||||
#define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
|
#define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#include <zephyr/arch/xtensa/exception.h>
|
#include <zephyr/arch/xtensa/exception.h>
|
||||||
#include <zephyr/sys/arch_interface.h>
|
#include <zephyr/arch/arch_interface.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ingroup xtensa_internal_apis
|
* @ingroup xtensa_internal_apis
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include <zephyr/device.h>
|
#include <zephyr/device.h>
|
||||||
#include <zephyr/irq.h>
|
#include <zephyr/irq.h>
|
||||||
#include <zephyr/irq_nextlevel.h>
|
#include <zephyr/irq_nextlevel.h>
|
||||||
#include <zephyr/sys/arch_interface.h>
|
#include <zephyr/arch/arch_interface.h>
|
||||||
#include "intc_cavs.h"
|
#include "intc_cavs.h"
|
||||||
|
|
||||||
#if defined(CONFIG_SMP) && (CONFIG_MP_MAX_NUM_CPUS > 1)
|
#if defined(CONFIG_SMP) && (CONFIG_MP_MAX_NUM_CPUS > 1)
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include <zephyr/drivers/pinctrl.h>
|
#include <zephyr/drivers/pinctrl.h>
|
||||||
#include <zephyr/drivers/sensor.h>
|
#include <zephyr/drivers/sensor.h>
|
||||||
#include <zephyr/logging/log.h>
|
#include <zephyr/logging/log.h>
|
||||||
#include <zephyr/sys/arch_interface.h>
|
#include <zephyr/arch/arch_interface.h>
|
||||||
|
|
||||||
#ifndef M_PI
|
#ifndef M_PI
|
||||||
#define M_PI 3.14159265358979323846
|
#define M_PI 3.14159265358979323846
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
* include/kernel.h and other public headers depend on definitions in this
|
* include/kernel.h and other public headers depend on definitions in this
|
||||||
* header.
|
* header.
|
||||||
*/
|
*/
|
||||||
#ifndef ZEPHYR_INCLUDE_SYS_ARCH_INTERFACE_H_
|
#ifndef ZEPHYR_INCLUDE_ARCH_ARCH_INTERFACE_H_
|
||||||
#define ZEPHYR_INCLUDE_SYS_ARCH_INTERFACE_H_
|
#define ZEPHYR_INCLUDE_ARCH_ARCH_INTERFACE_H_
|
||||||
|
|
||||||
#ifndef _ASMLANGUAGE
|
#ifndef _ASMLANGUAGE
|
||||||
#include <zephyr/toolchain.h>
|
#include <zephyr/toolchain.h>
|
||||||
|
@ -1248,4 +1248,4 @@ void arch_spin_relax(void);
|
||||||
|
|
||||||
#endif /* _ASMLANGUAGE */
|
#endif /* _ASMLANGUAGE */
|
||||||
|
|
||||||
#endif /* ZEPHYR_INCLUDE_SYS_ARCH_INTERFACE_H_ */
|
#endif /* ZEPHYR_INCLUDE_ARCH_ARCH_INTERFACE_H_ */
|
|
@ -9,7 +9,7 @@
|
||||||
#ifndef ZEPHYR_INCLUDE_ARCH_CPU_H_
|
#ifndef ZEPHYR_INCLUDE_ARCH_CPU_H_
|
||||||
#define ZEPHYR_INCLUDE_ARCH_CPU_H_
|
#define ZEPHYR_INCLUDE_ARCH_CPU_H_
|
||||||
|
|
||||||
#include <zephyr/sys/arch_interface.h>
|
#include <zephyr/arch/arch_interface.h>
|
||||||
|
|
||||||
#if defined(CONFIG_X86)
|
#if defined(CONFIG_X86)
|
||||||
#include <zephyr/arch/x86/arch.h>
|
#include <zephyr/arch/x86/arch.h>
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
#ifndef _ASMLANGUAGE
|
#ifndef _ASMLANGUAGE
|
||||||
#include <zephyr/kernel.h>
|
#include <zephyr/kernel.h>
|
||||||
#include <zephyr/sys/arch_interface.h>
|
#include <zephyr/arch/arch_interface.h>
|
||||||
#include <zephyr/sys/math_extras.h>
|
#include <zephyr/sys/math_extras.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <zephyr/logging/log.h>
|
#include <zephyr/logging/log.h>
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <zephyr/kernel/stats.h>
|
#include <zephyr/kernel/stats.h>
|
||||||
#include <zephyr/sys/arch_interface.h>
|
#include <zephyr/arch/arch_interface.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @typedef k_thread_entry_t
|
* @typedef k_thread_entry_t
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#ifndef ZEPHYR_INCLUDE_TIMING_TIMING_H_
|
#ifndef ZEPHYR_INCLUDE_TIMING_TIMING_H_
|
||||||
#define ZEPHYR_INCLUDE_TIMING_TIMING_H_
|
#define ZEPHYR_INCLUDE_TIMING_TIMING_H_
|
||||||
|
|
||||||
#include <zephyr/sys/arch_interface.h>
|
#include <zephyr/arch/arch_interface.h>
|
||||||
#include <zephyr/timing/types.h>
|
#include <zephyr/timing/types.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
* @brief Internal kernel APIs implemented at the architecture layer.
|
* @brief Internal kernel APIs implemented at the architecture layer.
|
||||||
*
|
*
|
||||||
* Not all architecture-specific defines are here, APIs that are used
|
* Not all architecture-specific defines are here, APIs that are used
|
||||||
* by public functions and macros are defined in include/sys/arch_interface.h.
|
* by public functions and macros are defined in include/zephyr/arch/arch_interface.h.
|
||||||
*
|
*
|
||||||
* For all inline functions prototyped here, the implementation is expected
|
* For all inline functions prototyped here, the implementation is expected
|
||||||
* to be provided by arch/ARCH/include/kernel_arch_func.h
|
* to be provided by arch/ARCH/include/kernel_arch_func.h
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
#define ZEPHYR_KERNEL_INCLUDE_KERNEL_ARCH_INTERFACE_H_
|
#define ZEPHYR_KERNEL_INCLUDE_KERNEL_ARCH_INTERFACE_H_
|
||||||
|
|
||||||
#include <zephyr/kernel.h>
|
#include <zephyr/kernel.h>
|
||||||
#include <zephyr/sys/arch_interface.h>
|
#include <zephyr/arch/arch_interface.h>
|
||||||
|
|
||||||
#ifndef _ASMLANGUAGE
|
#ifndef _ASMLANGUAGE
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
*/
|
*/
|
||||||
#include <zephyr/kernel.h>
|
#include <zephyr/kernel.h>
|
||||||
#include <zephyr/arch/cpu.h>
|
#include <zephyr/arch/cpu.h>
|
||||||
#include <zephyr/sys/arch_interface.h>
|
|
||||||
|
|
||||||
#define NUM_THREADS 3
|
#define NUM_THREADS 3
|
||||||
#define TCOUNT 10
|
#define TCOUNT 10
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
|
|
||||||
#include <zephyr/kernel.h>
|
#include <zephyr/kernel.h>
|
||||||
#include <zephyr/arch/cpu.h>
|
#include <zephyr/arch/cpu.h>
|
||||||
#include <zephyr/sys/arch_interface.h>
|
|
||||||
|
|
||||||
#define NUM_THREADS 20
|
#define NUM_THREADS 20
|
||||||
#define STACK_SIZE (1024)
|
#define STACK_SIZE (1024)
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
#include <zephyr/device.h>
|
#include <zephyr/device.h>
|
||||||
#include <zephyr/pm/device.h>
|
#include <zephyr/pm/device.h>
|
||||||
#include <zephyr/pm/device_runtime.h>
|
#include <zephyr/pm/device_runtime.h>
|
||||||
#include <zephyr/sys/arch_interface.h>
|
#include <zephyr/arch/arch_interface.h>
|
||||||
|
|
||||||
static const char *get_device_name(const struct device *dev,
|
static const char *get_device_name(const struct device *dev,
|
||||||
char *buf,
|
char *buf,
|
||||||
|
|
|
@ -109,7 +109,7 @@ static inline void trigger_irq(int irq)
|
||||||
#include <zephyr/drivers/interrupt_controller/loapic.h>
|
#include <zephyr/drivers/interrupt_controller/loapic.h>
|
||||||
#define VECTOR_MASK 0xFF
|
#define VECTOR_MASK 0xFF
|
||||||
#else
|
#else
|
||||||
#include <zephyr/sys/arch_interface.h>
|
#include <zephyr/arch/arch_interface.h>
|
||||||
#define LOAPIC_ICR_IPI_TEST 0x00004000U
|
#define LOAPIC_ICR_IPI_TEST 0x00004000U
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,7 @@ static inline bool arch_irq_unlocked(unsigned int key)
|
||||||
}
|
}
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
#include <zephyr/sys/arch_interface.h>
|
#include <zephyr/arch/arch_interface.h>
|
||||||
|
|
||||||
|
|
||||||
#endif /* ZEPHYR_SUBSYS_TESTSUITE_ZTEST_INCLUDE_ARCH_CPU_H */
|
#endif /* ZEPHYR_SUBSYS_TESTSUITE_ZTEST_INCLUDE_ARCH_CPU_H */
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
*/
|
*/
|
||||||
#include <zephyr/ztest.h>
|
#include <zephyr/ztest.h>
|
||||||
#include <zephyr/kernel.h>
|
#include <zephyr/kernel.h>
|
||||||
#include <zephyr/sys/arch_interface.h>
|
#include <zephyr/arch/arch_interface.h>
|
||||||
|
|
||||||
#if defined(CONFIG_SMP) && CONFIG_MP_MAX_NUM_CPUS > 1
|
#if defined(CONFIG_SMP) && CONFIG_MP_MAX_NUM_CPUS > 1
|
||||||
#define SMP_TEST
|
#define SMP_TEST
|
||||||
|
|
Loading…
Reference in a new issue