michaelh/zephyr
1
0
Fork 0
Code Releases Activity

include: migrate includes to <zephyr/...>

Browse source 
In order to bring consistency in-tree, migrate all includes within
include directory to the new prefix <zephyr/...>. Note that the
conversion has been scripted, refer to zephyrproject-rtos#45388 for more
details.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2022-05-06 10:30:42 +02:00 • committed by Carles Cufí
commit fb9b3bcd93
403 changed files with 966 additions and 966 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/zephyr/app_memory/app_memdomain.h
View file

@ -6,9 +6,9 @@
#ifndef ZEPHYR_INCLUDE_APP_MEMORY_APP_MEMDOMAIN_H_
#define ZEPHYR_INCLUDE_APP_MEMORY_APP_MEMDOMAIN_H_
#include <linker/linker-defs.h>
#include <sys/dlist.h>
#include <kernel.h>
#include <zephyr/linker/linker-defs.h>
#include <zephyr/sys/dlist.h>
#include <zephyr/kernel.h>
#ifdef CONFIG_USERSPACE

6
include/zephyr/app_memory/mem_domain.h
View file

@ -10,9 +10,9 @@
#include <stdint.h>
#include <stddef.h>
#include <sys/dlist.h>
#include <toolchain.h>
#include <kernel/thread.h>
#include <zephyr/sys/dlist.h>
#include <zephyr/toolchain.h>
#include <zephyr/kernel/thread.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/app_memory/partitions.h
View file

@ -8,7 +8,7 @@
#define ZEPHYR_APP_MEMORY_PARTITIONS_H
#ifdef CONFIG_USERSPACE
#include <kernel.h> /* For struct k_mem_partition */
#include <zephyr/kernel.h> /* For struct k_mem_partition */
#if defined(CONFIG_MBEDTLS)
extern struct k_mem_partition k_mbedtls_partition;

2
include/zephyr/arch/arc/arc_addr_types.h
View file

@ -20,7 +20,7 @@
typedef unsigned long paddr_t;
typedef void *vaddr_t;
#else
#include <arch/common/addr_types.h>
#include <zephyr/arch/common/addr_types.h>
#endif
#endif /* _ASMLANGUAGE */

30
include/zephyr/arch/arc/arch.h
View file

@ -17,29 +17,29 @@
#define ZEPHYR_INCLUDE_ARCH_ARC_ARCH_H_
#include <zephyr/devicetree.h>
#include <sw_isr_table.h>
#include <arch/common/ffs.h>
#include <arch/arc/thread.h>
#include <arch/common/sys_bitops.h>
#include <zephyr/sw_isr_table.h>
#include <zephyr/arch/common/ffs.h>
#include <zephyr/arch/arc/thread.h>
#include <zephyr/arch/common/sys_bitops.h>
#include "sys-io-common.h"
#include <arch/arc/v2/exc.h>
#include <arch/arc/v2/irq.h>
#include <arch/arc/v2/misc.h>
#include <arch/arc/v2/aux_regs.h>
#include <arch/arc/v2/arcv2_irq_unit.h>
#include <arch/arc/v2/asm_inline.h>
#include <arch/arc/arc_addr_types.h>
#include <arch/arc/v2/error.h>
#include <zephyr/arch/arc/v2/exc.h>
#include <zephyr/arch/arc/v2/irq.h>
#include <zephyr/arch/arc/v2/misc.h>
#include <zephyr/arch/arc/v2/aux_regs.h>
#include <zephyr/arch/arc/v2/arcv2_irq_unit.h>
#include <zephyr/arch/arc/v2/asm_inline.h>
#include <zephyr/arch/arc/arc_addr_types.h>
#include <zephyr/arch/arc/v2/error.h>
#ifdef CONFIG_ARC_CONNECT
#include <arch/arc/v2/arc_connect.h>
#include <zephyr/arch/arc/v2/arc_connect.h>
#endif
#ifdef CONFIG_ISA_ARCV2
#include "v2/sys_io.h"
#ifdef CONFIG_ARC_HAS_SECURE
#include <arch/arc/v2/secureshield/arc_secure.h>
#include <zephyr/arch/arc/v2/secureshield/arc_secure.h>
#endif
#endif
@ -239,7 +239,7 @@ BUILD_ASSERT(CONFIG_PRIVILEGED_STACK_SIZE % Z_ARC_MPU_ALIGN == 0,
#ifdef CONFIG_ARC_MPU
/* Legacy case: retain containing extern "C" with C++ */
#include <arch/arc/v2/mpu/arc_mpu.h>
#include <zephyr/arch/arc/v2/mpu/arc_mpu.h>
#define K_MEM_PARTITION_P_NA_U_NA AUX_MPU_ATTR_N
#define K_MEM_PARTITION_P_RW_U_RW (AUX_MPU_ATTR_UW | AUX_MPU_ATTR_UR | \

4
include/zephyr/arch/arc/arch_inlines.h
View file

@ -10,9 +10,9 @@
#ifndef _ASMLANGUAGE
#include <kernel_structs.h>
#include <zephyr/kernel_structs.h>
#include <arch/arc/v2/aux_regs.h>
#include <zephyr/arch/arc/v2/aux_regs.h>
static ALWAYS_INLINE _cpu_t *arch_curr_cpu(void)
{

6
include/zephyr/arch/arc/sys-io-common.h
View file

@ -9,9 +9,9 @@
#ifndef _ASMLANGUAGE
#include <toolchain.h>
#include <sys/sys_io.h>
#include <arch/arc/v2/aux_regs.h>
#include <zephyr/toolchain.h>
#include <zephyr/sys/sys_io.h>
#include <zephyr/arch/arc/v2/aux_regs.h>
#include <zephyr/types.h>
#include <stddef.h>

2
include/zephyr/arch/arc/syscall.h
View file

@ -27,7 +27,7 @@
#include <stdbool.h>
#ifdef CONFIG_ISA_ARCV2
#include <arch/arc/v2/aux_regs.h>
#include <zephyr/arch/arc/v2/aux_regs.h>
#endif
#ifdef __cplusplus

2
include/zephyr/arch/arc/v2/asm_inline.h
View file

@ -15,7 +15,7 @@
*/
#if defined(__GNUC__)
#include <arch/arc/v2/asm_inline_gcc.h>
#include <zephyr/arch/arc/v2/asm_inline_gcc.h>
#else
#erro "you need to provide an asm_inline.h for your compiler"
#endif

4
include/zephyr/arch/arc/v2/error.h
View file

@ -14,8 +14,8 @@
#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_ERROR_H_
#define ZEPHYR_INCLUDE_ARCH_ARC_V2_ERROR_H_
#include <arch/arc/syscall.h>
#include <arch/arc/v2/exc.h>
#include <zephyr/arch/arc/syscall.h>
#include <zephyr/arch/arc/v2/exc.h>
#include <stdbool.h>
#ifdef __cplusplus

10
include/zephyr/arch/arc/v2/irq.h
View file

@ -14,11 +14,11 @@
#ifndef ZEPHYR_INCLUDE_ARCH_ARC_V2_IRQ_H_
#define ZEPHYR_INCLUDE_ARCH_ARC_V2_IRQ_H_
#include <arch/arc/v2/aux_regs.h>
#include <toolchain/common.h>
#include <irq.h>
#include <sys/util.h>
#include <sw_isr_table.h>
#include <zephyr/arch/arc/v2/aux_regs.h>
#include <zephyr/toolchain/common.h>
#include <zephyr/irq.h>
#include <zephyr/sys/util.h>
#include <zephyr/sw_isr_table.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/arch/arc/v2/secureshield/arc_secure.h
View file

@ -26,7 +26,7 @@
#include <zephyr/types.h>
#include <stdbool.h>
#include <arch/arc/v2/aux_regs.h>
#include <zephyr/arch/arc/v2/aux_regs.h>
#ifdef __cplusplus
extern "C" {

6
include/zephyr/arch/arc/v2/sys_io.h
View file

@ -9,9 +9,9 @@
#ifndef _ASMLANGUAGE
#include <toolchain.h>
#include <sys/sys_io.h>
#include <arch/arc/v2/aux_regs.h>
#include <zephyr/toolchain.h>
#include <zephyr/sys/sys_io.h>
#include <zephyr/arch/arc/v2/aux_regs.h>
#include <zephyr/types.h>
#include <stddef.h>

12
include/zephyr/arch/arch_inlines.h
View file

@ -13,17 +13,17 @@
#define ZEPHYR_INCLUDE_ARCH_INLINES_H_
#if defined(CONFIG_X86) || defined(CONFIG_X86_64)
#include <arch/x86/arch_inlines.h>
#include <zephyr/arch/x86/arch_inlines.h>
#elif defined(CONFIG_ARM)
#include <arch/arm/aarch32/arch_inlines.h>
#include <zephyr/arch/arm/aarch32/arch_inlines.h>
#elif defined(CONFIG_ARM64)
#include <arch/arm64/arch_inlines.h>
#include <zephyr/arch/arm64/arch_inlines.h>
#elif defined(CONFIG_ARC)
#include <arch/arc/arch_inlines.h>
#include <zephyr/arch/arc/arch_inlines.h>
#elif defined(CONFIG_XTENSA)
#include <arch/xtensa/arch_inlines.h>
#include <zephyr/arch/xtensa/arch_inlines.h>
#elif defined(CONFIG_RISCV)
#include <arch/riscv/arch_inlines.h>
#include <zephyr/arch/riscv/arch_inlines.h>
#endif
#endif /* ZEPHYR_INCLUDE_ARCH_INLINES_H_ */

42
include/zephyr/arch/arm/aarch32/arch.h
View file

@ -22,29 +22,29 @@
/* ARM GPRs are often designated by two different names */
#define sys_define_gpr_with_alias(name1, name2) union { uint32_t name1, name2; }
#include <arch/arm/aarch32/thread.h>
#include <arch/arm/aarch32/exc.h>
#include <arch/arm/aarch32/irq.h>
#include <arch/arm/aarch32/error.h>
#include <arch/arm/aarch32/misc.h>
#include <arch/common/addr_types.h>
#include <arch/common/ffs.h>
#include <arch/arm/aarch32/nmi.h>
#include <arch/arm/aarch32/asm_inline.h>
#include <arch/common/sys_bitops.h>
#include <zephyr/arch/arm/aarch32/thread.h>
#include <zephyr/arch/arm/aarch32/exc.h>
#include <zephyr/arch/arm/aarch32/irq.h>
#include <zephyr/arch/arm/aarch32/error.h>
#include <zephyr/arch/arm/aarch32/misc.h>
#include <zephyr/arch/common/addr_types.h>
#include <zephyr/arch/common/ffs.h>
#include <zephyr/arch/arm/aarch32/nmi.h>
#include <zephyr/arch/arm/aarch32/asm_inline.h>
#include <zephyr/arch/common/sys_bitops.h>
#ifdef CONFIG_CPU_CORTEX_M
#include <arch/arm/aarch32/cortex_m/cpu.h>
#include <arch/arm/aarch32/cortex_m/memory_map.h>
#include <arch/common/sys_io.h>
#include <zephyr/arch/arm/aarch32/cortex_m/cpu.h>
#include <zephyr/arch/arm/aarch32/cortex_m/memory_map.h>
#include <zephyr/arch/common/sys_io.h>
#elif defined(CONFIG_CPU_AARCH32_CORTEX_R) || defined(CONFIG_CPU_AARCH32_CORTEX_A)
#include <arch/arm/aarch32/cortex_a_r/cpu.h>
#include <arch/arm/aarch32/cortex_a_r/sys_io.h>
#include <zephyr/arch/arm/aarch32/cortex_a_r/cpu.h>
#include <zephyr/arch/arm/aarch32/cortex_a_r/sys_io.h>
#if defined(CONFIG_AARCH32_ARMV8_R)
#include <arch/arm/aarch32/cortex_a_r/lib_helpers.h>
#include <arch/arm/aarch32/cortex_a_r/armv8_timer.h>
#include <zephyr/arch/arm/aarch32/cortex_a_r/lib_helpers.h>
#include <zephyr/arch/arm/aarch32/cortex_a_r/armv8_timer.h>
#else
#include <arch/arm/aarch32/cortex_a_r/timer.h>
#include <zephyr/arch/arm/aarch32/cortex_a_r/timer.h>
#endif
#endif
@ -207,14 +207,14 @@ extern "C" {
/* Legacy case: retain containing extern "C" with C++ */
#ifdef CONFIG_ARM_MPU
#ifdef CONFIG_CPU_HAS_ARM_MPU
#include <arch/arm/aarch32/mpu/arm_mpu.h>
#include <zephyr/arch/arm/aarch32/mpu/arm_mpu.h>
#endif /* CONFIG_CPU_HAS_ARM_MPU */
#ifdef CONFIG_CPU_HAS_NXP_MPU
#include <arch/arm/aarch32/mpu/nxp_mpu.h>
#include <zephyr/arch/arm/aarch32/mpu/nxp_mpu.h>
#endif /* CONFIG_CPU_HAS_NXP_MPU */
#endif /* CONFIG_ARM_MPU */
#ifdef CONFIG_ARM_AARCH32_MMU
#include <arch/arm/aarch32/mmu/arm_mmu.h>
#include <zephyr/arch/arm/aarch32/mmu/arm_mmu.h>
#endif /* CONFIG_ARM_AARCH32_MMU */
#ifdef __cplusplus

2
include/zephyr/arch/arm/aarch32/arch_inlines.h
View file

@ -7,7 +7,7 @@
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_INLINES_H
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_INLINES_H
#include <kernel_structs.h>
#include <zephyr/kernel_structs.h>
#ifndef CONFIG_SMP
static ALWAYS_INLINE _cpu_t *arch_curr_cpu(void)

2
include/zephyr/arch/arm/aarch32/asm_inline.h
View file

@ -15,7 +15,7 @@
*/
#if defined(__GNUC__)
#include <arch/arm/aarch32/asm_inline_gcc.h>
#include <zephyr/arch/arm/aarch32/asm_inline_gcc.h>
#else
#include <arch/arm/asm_inline_other.h>
#endif

6
include/zephyr/arch/arm/aarch32/asm_inline_gcc.h
View file

@ -19,11 +19,11 @@
#ifndef _ASMLANGUAGE
#include <zephyr/types.h>
#include <arch/arm/aarch32/exc.h>
#include <irq.h>
#include <zephyr/arch/arm/aarch32/exc.h>
#include <zephyr/irq.h>
#if defined(CONFIG_CPU_AARCH32_CORTEX_R) || defined(CONFIG_CPU_AARCH32_CORTEX_A)
#include <arch/arm/aarch32/cortex_a_r/cpu.h>
#include <zephyr/arch/arm/aarch32/cortex_a_r/cpu.h>
#endif
#ifdef __cplusplus

2
include/zephyr/arch/arm/aarch32/cortex_a_r/armv8_timer.h
View file

@ -10,7 +10,7 @@
#ifndef _ASMLANGUAGE
#include <drivers/timer/arm_arch_timer.h>
#include <zephyr/drivers/timer/arm_arch_timer.h>
#include <zephyr/types.h>
#ifdef __cplusplus

2
include/zephyr/arch/arm/aarch32/cortex_a_r/cmsis.h
View file

@ -61,6 +61,6 @@ extern "C" {
#error "Unknown device"
#endif
#include <arch/arm/aarch32/cortex_a_r/cmsis_ext.h>
#include <zephyr/arch/arm/aarch32/cortex_a_r/cmsis_ext.h>
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_CMSIS_H_ */

2
include/zephyr/arch/arm/aarch32/cortex_a_r/cpu.h
View file

@ -8,7 +8,7 @@
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_CPU_H_
#if defined(CONFIG_ARM_MPU)
#include <arch/arm/aarch32/cortex_a_r/mpu.h>
#include <zephyr/arch/arm/aarch32/cortex_a_r/mpu.h>
#endif
/*

4
include/zephyr/arch/arm/aarch32/cortex_a_r/sys_io.h
View file

@ -15,8 +15,8 @@
#ifndef _ASMLANGUAGE
#include <zephyr/types.h>
#include <sys/sys_io.h>
#include <arch/arm/aarch32/cortex_a_r/cmsis.h>
#include <zephyr/sys/sys_io.h>
#include <zephyr/arch/arm/aarch32/cortex_a_r/cmsis.h>
#ifdef __cplusplus
extern "C" {

4
include/zephyr/arch/arm/aarch32/cortex_a_r/timer.h
View file

@ -11,8 +11,8 @@
#ifndef _ASMLANGUAGE
#include <drivers/timer/arm_arch_timer.h>
#include <sys/device_mmio.h>
#include <zephyr/drivers/timer/arm_arch_timer.h>
#include <zephyr/sys/device_mmio.h>
#include <zephyr/types.h>
#ifdef __cplusplus

2
include/zephyr/arch/arm/aarch32/cortex_m/cmsis.h
View file

@ -16,7 +16,7 @@
#include <soc.h>
#include <arch/arm/aarch32/cortex_m/nvic.h>
#include <zephyr/arch/arm/aarch32/cortex_m/nvic.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/arch/arm/aarch32/cortex_m/memory_map.h
View file

@ -15,7 +15,7 @@
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MEMORY_MAP_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MEMORY_MAP_H_
#include <sys/util.h>
#include <zephyr/sys/util.h>
/* 0x00000000 -> 0x1fffffff: Code in ROM [0.5 GB] */
#define _CODE_BASE_ADDR 0x00000000

4
include/zephyr/arch/arm/aarch32/error.h
View file

@ -15,8 +15,8 @@
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ERROR_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ERROR_H_
#include <arch/arm/aarch32/syscall.h>
#include <arch/arm/aarch32/exc.h>
#include <zephyr/arch/arm/aarch32/syscall.h>
#include <zephyr/arch/arm/aarch32/exc.h>
#include <stdbool.h>
#ifdef __cplusplus

2
include/zephyr/arch/arm/aarch32/exc.h
View file

@ -18,7 +18,7 @@
#if defined(CONFIG_CPU_CORTEX_M)
#include <zephyr/devicetree.h>
#include <arch/arm/aarch32/cortex_m/nvic.h>
#include <zephyr/arch/arm/aarch32/cortex_m/nvic.h>
/* for assembler, only works with constants */
#define Z_EXC_PRIO(pri) (((pri) << (8 - NUM_IRQ_PRIO_BITS)) & 0xff)

4
include/zephyr/arch/arm/aarch32/irq.h
View file

@ -16,8 +16,8 @@
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_IRQ_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_IRQ_H_
#include <irq.h>
#include <sw_isr_table.h>
#include <zephyr/irq.h>
#include <zephyr/sw_isr_table.h>
#include <stdbool.h>
#ifdef __cplusplus

4
include/zephyr/arch/arm/aarch32/mpu/arm_mpu.h
View file

@ -11,11 +11,11 @@
defined(CONFIG_CPU_CORTEX_M4) || \
defined(CONFIG_CPU_CORTEX_M7) || \
defined(CONFIG_CPU_AARCH32_CORTEX_R)
#include <arch/arm/aarch32/mpu/arm_mpu_v7m.h>
#include <zephyr/arch/arm/aarch32/mpu/arm_mpu_v7m.h>
#elif defined(CONFIG_CPU_CORTEX_M23) || \
defined(CONFIG_CPU_CORTEX_M33) || \
defined(CONFIG_CPU_CORTEX_M55)
#include <arch/arm/aarch32/mpu/arm_mpu_v8m.h>
#include <zephyr/arch/arm/aarch32/mpu/arm_mpu_v8m.h>
#else
#error "Unsupported ARM CPU"
#endif

2
include/zephyr/arch/arm/aarch32/mpu/arm_mpu_v7m.h
View file

@ -8,7 +8,7 @@
#ifndef _ASMLANGUAGE
#if defined(CONFIG_CPU_CORTEX_M)
#include <arch/arm/aarch32/cortex_m/cmsis.h>
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
#endif
/* Convenience macros to represent the ARMv7-M-specific

2
include/zephyr/arch/arm/aarch32/mpu/arm_mpu_v8m.h
View file

@ -7,7 +7,7 @@
#ifndef _ASMLANGUAGE
#include <arch/arm/aarch32/cortex_m/cmsis.h>
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
/* Convenience macros to represent the ARMv8-M-specific
* configuration for memory access permission and

2
include/zephyr/arch/arm/aarch32/syscall.h
View file

@ -26,7 +26,7 @@
#include <zephyr/types.h>
#include <stdbool.h>
#include <arch/arm/aarch32/misc.h>
#include <zephyr/arch/arm/aarch32/misc.h>
#ifdef __cplusplus
extern "C" {

32
include/zephyr/arch/arm64/arch.h
View file

@ -19,21 +19,21 @@
/* Add include for DTS generated information */
#include <zephyr/devicetree.h>
#include <arch/arm64/thread.h>
#include <arch/arm64/exc.h>
#include <arch/arm64/irq.h>
#include <arch/arm64/misc.h>
#include <arch/arm64/asm_inline.h>
#include <arch/arm64/cpu.h>
#include <arch/arm64/macro.inc>
#include <arch/arm64/sys_io.h>
#include <arch/arm64/timer.h>
#include <arch/arm64/error.h>
#include <arch/arm64/mm.h>
#include <arch/arm64/thread_stack.h>
#include <arch/common/addr_types.h>
#include <arch/common/sys_bitops.h>
#include <arch/common/ffs.h>
#include <zephyr/arch/arm64/thread.h>
#include <zephyr/arch/arm64/exc.h>
#include <zephyr/arch/arm64/irq.h>
#include <zephyr/arch/arm64/misc.h>
#include <zephyr/arch/arm64/asm_inline.h>
#include <zephyr/arch/arm64/cpu.h>
#include <zephyr/arch/arm64/macro.inc>
#include <zephyr/arch/arm64/sys_io.h>
#include <zephyr/arch/arm64/timer.h>
#include <zephyr/arch/arm64/error.h>
#include <zephyr/arch/arm64/mm.h>
#include <zephyr/arch/arm64/thread_stack.h>
#include <zephyr/arch/common/addr_types.h>
#include <zephyr/arch/common/sys_bitops.h>
#include <zephyr/arch/common/ffs.h>
#ifdef __cplusplus
extern "C" {
@ -41,7 +41,7 @@ extern "C" {
#ifndef _ASMLANGUAGE
#include <sys/slist.h>
#include <zephyr/sys/slist.h>
struct arch_mem_domain {
#ifdef CONFIG_ARM_MMU

6
include/zephyr/arch/arm64/arch_inlines.h
View file

@ -9,9 +9,9 @@
#ifndef _ASMLANGUAGE
#include <kernel_structs.h>
#include <arch/arm64/lib_helpers.h>
#include <arch/arm64/tpidrro_el0.h>
#include <zephyr/kernel_structs.h>
#include <zephyr/arch/arm64/lib_helpers.h>
#include <zephyr/arch/arm64/tpidrro_el0.h>
static ALWAYS_INLINE _cpu_t *arch_curr_cpu(void)
{

2
include/zephyr/arch/arm64/asm_inline.h
View file

@ -13,7 +13,7 @@
*/
#if defined(__GNUC__)
#include <arch/arm64/asm_inline_gcc.h>
#include <zephyr/arch/arm64/asm_inline_gcc.h>
#else
#include <arch/arm/asm_inline_other.h>
#endif

2
include/zephyr/arch/arm64/asm_inline_gcc.h
View file

@ -16,7 +16,7 @@
#ifndef _ASMLANGUAGE
#include <arch/arm64/lib_helpers.h>
#include <zephyr/arch/arm64/lib_helpers.h>
#include <zephyr/types.h>
#ifdef __cplusplus

2
include/zephyr/arch/arm64/cpu.h
View file

@ -7,7 +7,7 @@
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_CPU_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_CPU_H_
#include <sys/util.h>
#include <zephyr/sys/util.h>
#define DAIFSET_FIQ_BIT BIT(0)
#define DAIFSET_IRQ_BIT BIT(1)

4
include/zephyr/arch/arm64/error.h
View file

@ -14,8 +14,8 @@
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_ERROR_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_ERROR_H_
#include <arch/arm64/syscall.h>
#include <arch/arm64/exc.h>
#include <zephyr/arch/arm64/syscall.h>
#include <zephyr/arch/arm64/exc.h>
#include <stdbool.h>
#ifdef __cplusplus

4
include/zephyr/arch/arm64/irq.h
View file

@ -15,8 +15,8 @@
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_IRQ_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_IRQ_H_
#include <irq.h>
#include <sw_isr_table.h>
#include <zephyr/irq.h>
#include <zephyr/sw_isr_table.h>
#include <stdbool.h>
#ifdef __cplusplus

2
include/zephyr/arch/arm64/lib_helpers.h
View file

@ -9,7 +9,7 @@
#ifndef _ASMLANGUAGE
#include <arch/arm64/cpu.h>
#include <zephyr/arch/arm64/cpu.h>
#include <stdint.h>
/* All the macros need a memory clobber */

4
include/zephyr/arch/arm64/mm.h
View file

@ -7,14 +7,14 @@
#define ZEPHYR_INCLUDE_ARCH_ARM64_MM_H_
#if defined(CONFIG_ARM_MMU)
#include <arch/arm64/arm_mmu.h>
#include <zephyr/arch/arm64/arm_mmu.h>
/*
* When mmu enabled, some section addresses need to be aligned with
* page size which is CONFIG_MMU_PAGE_SIZE
*/
#define MEM_DOMAIN_ALIGN_AND_SIZE CONFIG_MMU_PAGE_SIZE
#elif defined(CONFIG_ARM_MPU)
#include <arch/arm64/cortex_r/arm_mpu.h>
#include <zephyr/arch/arm64/cortex_r/arm_mpu.h>
/*
* When mpu enabled, some section addresses need to be aligned with
* mpu region min align size which is

2
include/zephyr/arch/arm64/sys_io.h
View file

@ -15,7 +15,7 @@
#ifndef _ASMLANGUAGE
#include <zephyr/types.h>
#include <sys/sys_io.h>
#include <zephyr/sys/sys_io.h>
#ifdef __cplusplus
extern "C" {

4
include/zephyr/arch/arm64/syscall.h
View file

@ -25,8 +25,8 @@
#include <zephyr/types.h>
#include <stdbool.h>
#include <arch/arm64/lib_helpers.h>
#include <arch/arm64/tpidrro_el0.h>
#include <zephyr/arch/arm64/lib_helpers.h>
#include <zephyr/arch/arm64/tpidrro_el0.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/arch/arm64/thread_stack.h
View file

@ -11,7 +11,7 @@
#define ARCH_STACK_PTR_ALIGN 16
#if CONFIG_USERSPACE
#include <arch/arm64/mm.h>
#include <zephyr/arch/arm64/mm.h>
#define Z_ARM64_STACK_BASE_ALIGN MEM_DOMAIN_ALIGN_AND_SIZE
#define Z_ARM64_STACK_SIZE_ALIGN MEM_DOMAIN_ALIGN_AND_SIZE
#else

2
include/zephyr/arch/arm64/timer.h
View file

@ -9,7 +9,7 @@
#ifndef _ASMLANGUAGE
#include <drivers/timer/arm_arch_timer.h>
#include <zephyr/drivers/timer/arm_arch_timer.h>
#include <zephyr/types.h>
#ifdef __cplusplus

4
include/zephyr/arch/common/sys_bitops.h
View file

@ -13,9 +13,9 @@
#ifndef _ASMLANGUAGE
#include <toolchain.h>
#include <zephyr/toolchain.h>
#include <zephyr/types.h>
#include <sys/sys_io.h>
#include <zephyr/sys/sys_io.h>
#ifdef __cplusplus
extern "C" {

4
include/zephyr/arch/common/sys_io.h
View file

@ -12,9 +12,9 @@
#ifndef _ASMLANGUAGE
#include <toolchain.h>
#include <zephyr/toolchain.h>
#include <zephyr/types.h>
#include <sys/sys_io.h>
#include <zephyr/sys/sys_io.h>
#ifdef __cplusplus
extern "C" {

22
include/zephyr/arch/cpu.h
View file

@ -9,28 +9,28 @@
#ifndef ZEPHYR_INCLUDE_ARCH_CPU_H_
#define ZEPHYR_INCLUDE_ARCH_CPU_H_
#include <sys/arch_interface.h>
#include <zephyr/sys/arch_interface.h>
#if defined(CONFIG_X86)
#include <arch/x86/arch.h>
#include <zephyr/arch/x86/arch.h>
#elif defined(CONFIG_ARM64)
#include <arch/arm64/arch.h>
#include <zephyr/arch/arm64/arch.h>
#elif defined(CONFIG_ARM)
#include <arch/arm/aarch32/arch.h>
#include <zephyr/arch/arm/aarch32/arch.h>
#elif defined(CONFIG_ARC)
#include <arch/arc/arch.h>
#include <zephyr/arch/arc/arch.h>
#elif defined(CONFIG_NIOS2)
#include <arch/nios2/arch.h>
#include <zephyr/arch/nios2/arch.h>
#elif defined(CONFIG_RISCV)
#include <arch/riscv/arch.h>
#include <zephyr/arch/riscv/arch.h>
#elif defined(CONFIG_XTENSA)
#include <arch/xtensa/arch.h>
#include <zephyr/arch/xtensa/arch.h>
#elif defined(CONFIG_MIPS)
#include <arch/mips/arch.h>
#include <zephyr/arch/mips/arch.h>
#elif defined(CONFIG_ARCH_POSIX)
#include <arch/posix/arch.h>
#include <zephyr/arch/posix/arch.h>
#elif defined(CONFIG_SPARC)
#include <arch/sparc/arch.h>
#include <zephyr/arch/sparc/arch.h>
#else
#error "Unknown Architecture"
#endif

16
include/zephyr/arch/mips/arch.h
View file

@ -9,14 +9,14 @@
#ifndef ZEPHYR_INCLUDE_ARCH_MIPS_ARCH_H_
#define ZEPHYR_INCLUDE_ARCH_MIPS_ARCH_H_
#include <arch/mips/thread.h>
#include <arch/mips/exp.h>
#include <arch/common/sys_bitops.h>
#include <arch/common/sys_io.h>
#include <arch/common/ffs.h>
#include <zephyr/arch/mips/thread.h>
#include <zephyr/arch/mips/exp.h>
#include <zephyr/arch/common/sys_bitops.h>
#include <zephyr/arch/common/sys_io.h>
#include <zephyr/arch/common/ffs.h>
#include <irq.h>
#include <sw_isr_table.h>
#include <zephyr/irq.h>
#include <zephyr/sw_isr_table.h>
#include <zephyr/devicetree.h>
#include <mips/mipsregs.h>
@ -28,7 +28,7 @@
#define CP0_STATUS_DEF_RESTORE (ST0_EXL | ST0_IE)
#ifndef _ASMLANGUAGE
#include <sys/util.h>
#include <zephyr/sys/util.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/arch/mips/exp.h
View file

@ -11,7 +11,7 @@
#ifndef _ASMLANGUAGE
#include <zephyr/types.h>
#include <toolchain.h>
#include <zephyr/toolchain.h>
#ifdef __cplusplus
extern "C" {

18
include/zephyr/arch/nios2/arch.h
View file

@ -16,21 +16,21 @@
#include <system.h>
#include <arch/nios2/thread.h>
#include <arch/nios2/asm_inline.h>
#include <arch/common/addr_types.h>
#include <zephyr/arch/nios2/thread.h>
#include <zephyr/arch/nios2/asm_inline.h>
#include <zephyr/arch/common/addr_types.h>
#include <zephyr/devicetree.h>
#include <arch/nios2/nios2.h>
#include <arch/common/sys_bitops.h>
#include <sys/sys_io.h>
#include <arch/common/ffs.h>
#include <zephyr/arch/nios2/nios2.h>
#include <zephyr/arch/common/sys_bitops.h>
#include <zephyr/sys/sys_io.h>
#include <zephyr/arch/common/ffs.h>
#define ARCH_STACK_PTR_ALIGN 4
#ifndef _ASMLANGUAGE
#include <zephyr/types.h>
#include <irq.h>
#include <sw_isr_table.h>
#include <zephyr/irq.h>
#include <zephyr/sw_isr_table.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/arch/nios2/asm_inline.h
View file

@ -13,7 +13,7 @@
*/
#if defined(__GNUC__)
#include <arch/nios2/asm_inline_gcc.h>
#include <zephyr/arch/nios2/asm_inline_gcc.h>
#else
#include <arch/nios2/asm_inline_other.h>
#endif

4
include/zephyr/arch/nios2/asm_inline_gcc.h
View file

@ -14,8 +14,8 @@
#ifndef _ASMLANGUAGE
#include <zephyr/types.h>
#include <sys/sys_io.h>
#include <toolchain.h>
#include <zephyr/sys/sys_io.h>
#include <zephyr/toolchain.h>
/* Using the *io variants of these instructions to prevent issues on
* devices that have an instruction/data cache

4
include/zephyr/arch/nios2/nios2.h
View file

@ -54,8 +54,8 @@ extern "C"
#ifndef _ASMLANGUAGE
#include <zephyr/types.h>
#include <arch/cpu.h>
#include <sys/sys_io.h>
#include <zephyr/arch/cpu.h>
#include <zephyr/sys/sys_io.h>
/*
* Functions for accessing select Nios II general-purpose registers.

12
include/zephyr/arch/posix/arch.h
View file

@ -20,13 +20,13 @@
/* Add include for DTS generated information */
#include <zephyr/devicetree.h>
#include <toolchain.h>
#include <irq.h>
#include <arch/posix/asm_inline.h>
#include <arch/posix/thread.h>
#include <zephyr/toolchain.h>
#include <zephyr/irq.h>
#include <zephyr/arch/posix/asm_inline.h>
#include <zephyr/arch/posix/thread.h>
#include <board_irq.h> /* Each board must define this */
#include <sw_isr_table.h>
#include <arch/posix/posix_soc_if.h>
#include <zephyr/sw_isr_table.h>
#include <zephyr/arch/posix/posix_soc_if.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/arch/posix/asm_inline.h
View file

@ -15,7 +15,7 @@
*/
#if defined(__GNUC__)
#include <arch/posix/asm_inline_gcc.h>
#include <zephyr/arch/posix/asm_inline_gcc.h>
#else
#error "Only a compiler with GNU C extensions is supported for the POSIX arch"
#endif

10
include/zephyr/arch/posix/asm_inline_gcc.h
View file

@ -21,12 +21,12 @@
#ifndef _ASMLANGUAGE
#include <toolchain/common.h>
#include <zephyr/toolchain/common.h>
#include <zephyr/types.h>
#include <arch/common/sys_bitops.h>
#include <arch/common/sys_io.h>
#include <arch/common/ffs.h>
#include <arch/posix/posix_soc_if.h>
#include <zephyr/arch/common/sys_bitops.h>
#include <zephyr/arch/common/sys_io.h>
#include <zephyr/arch/common/ffs.h>
#include <zephyr/arch/posix/posix_soc_if.h>
#endif /* _ASMLANGUAGE */

2
include/zephyr/arch/posix/posix_soc_if.h
View file

@ -14,7 +14,7 @@
* or all its boards
*/
#include <arch/posix/posix_trace.h>
#include <zephyr/arch/posix/posix_trace.h>
#include "soc_irq.h" /* Must exist and define _ARCH_IRQ/ISR_* macros */
#ifdef __cplusplus

24
include/zephyr/arch/riscv/arch.h
View file

@ -15,19 +15,19 @@
#ifndef ZEPHYR_INCLUDE_ARCH_RISCV_ARCH_H_
#define ZEPHYR_INCLUDE_ARCH_RISCV_ARCH_H_
#include <arch/riscv/thread.h>
#include <arch/riscv/exp.h>
#include <arch/common/sys_bitops.h>
#include <arch/common/sys_io.h>
#include <arch/common/ffs.h>
#include <zephyr/arch/riscv/thread.h>
#include <zephyr/arch/riscv/exp.h>
#include <zephyr/arch/common/sys_bitops.h>
#include <zephyr/arch/common/sys_io.h>
#include <zephyr/arch/common/ffs.h>
#if defined(CONFIG_USERSPACE)
#include <arch/riscv/syscall.h>
#include <zephyr/arch/riscv/syscall.h>
#endif /* CONFIG_USERSPACE */
#include <irq.h>
#include <sw_isr_table.h>
#include <zephyr/irq.h>
#include <zephyr/sw_isr_table.h>
#include <soc.h>
#include <zephyr/devicetree.h>
#include <arch/riscv/csr.h>
#include <zephyr/arch/riscv/csr.h>
/* stacks, for RISCV architecture stack should be 16byte-aligned */
#define ARCH_STACK_PTR_ALIGN 16
@ -217,7 +217,7 @@
#define MSTATUS_DEF_RESTORE (MSTATUS_MPP_M | MSTATUS_MPIE_EN)
#ifndef _ASMLANGUAGE
#include <sys/util.h>
#include <zephyr/sys/util.h>
#ifdef __cplusplus
extern "C" {
@ -349,7 +349,7 @@ static inline uint64_t arch_k_cycle_get_64(void)
return sys_clock_cycle_get_64();
}
#include <arch/riscv/error.h>
#include <zephyr/arch/riscv/error.h>
#ifdef __cplusplus
}
@ -358,7 +358,7 @@ static inline uint64_t arch_k_cycle_get_64(void)
#endif /*_ASMLANGUAGE */
#if defined(CONFIG_SOC_FAMILY_RISCV_PRIVILEGE)
#include <arch/riscv/riscv-privilege/asm_inline.h>
#include <zephyr/arch/riscv/riscv-privilege/asm_inline.h>
#endif

2
include/zephyr/arch/riscv/arch_inlines.h
View file

@ -9,7 +9,7 @@
#ifndef _ASMLANGUAGE
#include <kernel_structs.h>
#include <zephyr/kernel_structs.h>
static ALWAYS_INLINE _cpu_t *arch_curr_cpu(void)
{

4
include/zephyr/arch/riscv/error.h
View file

@ -14,8 +14,8 @@
#ifndef ZEPHYR_INCLUDE_ARCH_RISCV_ERROR_H_
#define ZEPHYR_INCLUDE_ARCH_RISCV_ERROR_H_
#include <arch/riscv/syscall.h>
#include <arch/riscv/exp.h>
#include <zephyr/arch/riscv/syscall.h>
#include <zephyr/arch/riscv/exp.h>
#include <stdbool.h>
#ifdef __cplusplus

2
include/zephyr/arch/riscv/exp.h
View file

@ -17,7 +17,7 @@
#ifndef _ASMLANGUAGE
#include <zephyr/types.h>
#include <toolchain.h>
#include <zephyr/toolchain.h>
#ifdef CONFIG_RISCV_SOC_CONTEXT_SAVE
#include <soc_context.h>

2
include/zephyr/arch/riscv/riscv-privilege/asm_inline.h
View file

@ -14,7 +14,7 @@
*/
#if defined(__GNUC__)
#include <arch/riscv/riscv-privilege/asm_inline_gcc.h>
#include <zephyr/arch/riscv/riscv-privilege/asm_inline_gcc.h>
#else
#error "Supports only GNU C compiler"
#endif

2
include/zephyr/arch/riscv/riscv-privilege/asm_inline_gcc.h
View file

@ -15,7 +15,7 @@
#ifndef _ASMLANGUAGE
#include <toolchain.h>
#include <zephyr/toolchain.h>
#endif /* _ASMLANGUAGE */

16
include/zephyr/arch/sparc/arch.h
View file

@ -14,14 +14,14 @@
#ifndef ZEPHYR_INCLUDE_ARCH_SPARC_ARCH_H_
#define ZEPHYR_INCLUDE_ARCH_SPARC_ARCH_H_
#include <arch/sparc/thread.h>
#include <arch/sparc/sparc.h>
#include <arch/common/sys_bitops.h>
#include <arch/common/sys_io.h>
#include <arch/common/ffs.h>
#include <zephyr/arch/sparc/thread.h>
#include <zephyr/arch/sparc/sparc.h>
#include <zephyr/arch/common/sys_bitops.h>
#include <zephyr/arch/common/sys_io.h>
#include <zephyr/arch/common/ffs.h>
#include <irq.h>
#include <sw_isr_table.h>
#include <zephyr/irq.h>
#include <zephyr/sw_isr_table.h>
#include <soc.h>
#include <zephyr/devicetree.h>
@ -37,7 +37,7 @@
#define SPARC_SW_TRAP_EXCEPT 0x0F
#ifndef _ASMLANGUAGE
#include <sys/util.h>
#include <zephyr/sys/util.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/arch/structs.h
View file

@ -24,7 +24,7 @@
#if !defined(_ASMLANGUAGE)
#if defined(CONFIG_ARM64)
#include <arch/arm64/structs.h>
#include <zephyr/arch/arm64/structs.h>
#else
/* Default definitions when no architecture specific definitions exist. */

12
include/zephyr/arch/syscall.h
View file

@ -11,18 +11,18 @@
#if defined(CONFIG_X86)
#if defined(CONFIG_X86_64)
#include <arch/x86/intel64/syscall.h>
#include <zephyr/arch/x86/intel64/syscall.h>
#else
#include <arch/x86/ia32/syscall.h>
#include <zephyr/arch/x86/ia32/syscall.h>
#endif
#elif defined(CONFIG_ARM64)
#include <arch/arm64/syscall.h>
#include <zephyr/arch/arm64/syscall.h>
#elif defined(CONFIG_ARM)
#include <arch/arm/aarch32/syscall.h>
#include <zephyr/arch/arm/aarch32/syscall.h>
#elif defined(CONFIG_ARC)
#include <arch/arc/syscall.h>
#include <zephyr/arch/arc/syscall.h>
#elif defined(CONFIG_RISCV)
#include <arch/riscv/syscall.h>
#include <zephyr/arch/riscv/syscall.h>
#endif
#endif /* ZEPHYR_INCLUDE_ARCH_SYSCALL_H_ */

18
include/zephyr/arch/x86/arch.h
View file

@ -15,14 +15,14 @@
#if !defined(_ASMLANGUAGE)
#include <sys/sys_io.h>
#include <zephyr/sys/sys_io.h>
#include <zephyr/types.h>
#include <stddef.h>
#include <stdbool.h>
#include <irq.h>
#include <arch/x86/mmustructs.h>
#include <arch/x86/thread_stack.h>
#include <linker/sections.h>
#include <zephyr/irq.h>
#include <zephyr/arch/x86/mmustructs.h>
#include <zephyr/arch/x86/thread_stack.h>
#include <zephyr/linker/sections.h>
#ifdef __cplusplus
extern "C" {
@ -228,15 +228,15 @@ extern unsigned char _irq_to_interrupt_vector[];
}
#endif
#include <drivers/interrupt_controller/sysapic.h>
#include <zephyr/drivers/interrupt_controller/sysapic.h>
#ifdef CONFIG_X86_64
#include <arch/x86/intel64/arch.h>
#include <zephyr/arch/x86/intel64/arch.h>
#else
#include <arch/x86/ia32/arch.h>
#include <zephyr/arch/x86/ia32/arch.h>
#endif
#include <arch/common/ffs.h>
#include <zephyr/arch/common/ffs.h>
#ifdef __cplusplus
extern "C" {

4
include/zephyr/arch/x86/arch_inlines.h
View file

@ -12,8 +12,8 @@
#if defined(CONFIG_X86_64)
#include <arch/x86/intel64/thread.h>
#include <kernel_structs.h>
#include <zephyr/arch/x86/intel64/thread.h>
#include <zephyr/kernel_structs.h>
static inline struct _cpu *arch_curr_cpu(void)
{

18
include/zephyr/arch/x86/ia32/arch.h
View file

@ -16,19 +16,19 @@
#include "sys_io.h"
#include <stdbool.h>
#include <kernel_structs.h>
#include <arch/common/ffs.h>
#include <sys/util.h>
#include <arch/x86/ia32/gdbstub.h>
#include <arch/x86/ia32/thread.h>
#include <arch/x86/ia32/syscall.h>
#include <zephyr/kernel_structs.h>
#include <zephyr/arch/common/ffs.h>
#include <zephyr/sys/util.h>
#include <zephyr/arch/x86/ia32/gdbstub.h>
#include <zephyr/arch/x86/ia32/thread.h>
#include <zephyr/arch/x86/ia32/syscall.h>
#ifndef _ASMLANGUAGE
#include <stddef.h> /* for size_t */
#include <arch/common/addr_types.h>
#include <arch/x86/ia32/segmentation.h>
#include <pm/pm.h>
#include <zephyr/arch/common/addr_types.h>
#include <zephyr/arch/x86/ia32/segmentation.h>
#include <zephyr/pm/pm.h>
#endif /* _ASMLANGUAGE */

4
include/zephyr/arch/x86/ia32/asm.h
View file

@ -9,8 +9,8 @@
#ifndef ZEPHYR_INCLUDE_ARCH_X86_IA32_ASM_H_
#define ZEPHYR_INCLUDE_ARCH_X86_IA32_ASM_H_
#include <toolchain.h>
#include <linker/sections.h>
#include <zephyr/toolchain.h>
#include <zephyr/linker/sections.h>
#if defined(_ASMLANGUAGE)

2
include/zephyr/arch/x86/ia32/gdbstub.h
View file

@ -15,7 +15,7 @@
#ifndef _ASMLANGUAGE
#include <stdint.h>
#include <toolchain.h>
#include <zephyr/toolchain.h>
/**
* @brief Number of register used by gdbstub in IA-32

2
include/zephyr/arch/x86/ia32/sys_io.h
View file

@ -11,7 +11,7 @@
#if !defined(_ASMLANGUAGE)
#include <sys/sys_io.h>
#include <zephyr/sys/sys_io.h>
#include <zephyr/types.h>
#include <stddef.h>

2
include/zephyr/arch/x86/ia32/syscall.h
View file

@ -24,7 +24,7 @@
#include <zephyr/types.h>
#include <stdbool.h>
#include <linker/sections.h>
#include <zephyr/linker/sections.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/arch/x86/ia32/thread.h
View file

@ -49,7 +49,7 @@
#ifndef _ASMLANGUAGE
#include <stdint.h>
#include <arch/x86/mmustructs.h>
#include <zephyr/arch/x86/mmustructs.h>
/*
* The following structure defines the set of 'non-volatile' integer registers.

4
include/zephyr/arch/x86/intel64/arch.h
View file

@ -6,8 +6,8 @@
#ifndef ZEPHYR_INCLUDE_ARCH_X86_INTEL64_ARCH_H_
#define ZEPHYR_INCLUDE_ARCH_X86_INTEL64_ARCH_H_
#include <arch/x86/intel64/thread.h>
#include <arch/x86/thread_stack.h>
#include <zephyr/arch/x86/intel64/thread.h>
#include <zephyr/arch/x86/thread_stack.h>
#if CONFIG_ISR_STACK_SIZE != (CONFIG_ISR_SUBSTACK_SIZE * CONFIG_ISR_DEPTH)
#error "Check ISR stack configuration (CONFIG_ISR_*)"

2
include/zephyr/arch/x86/intel64/thread.h
View file

@ -46,7 +46,7 @@
#ifndef _ASMLANGUAGE
#include <zephyr/types.h>
#include <arch/x86/mmustructs.h>
#include <zephyr/arch/x86/mmustructs.h>
/*
* 64-bit Task State Segment. One defined per CPU.

4
include/zephyr/arch/x86/mmustructs.h
View file

@ -8,7 +8,7 @@
#ifndef ZEPHYR_INCLUDE_ARCH_X86_MMU_H
#define ZEPHYR_INCLUDE_ARCH_X86_MMU_H
#include <sys/util.h>
#include <zephyr/sys/util.h>
/*
* K_MEM_PARTITION_* defines
@ -54,7 +54,7 @@
Z_X86_MMU_XD)
#ifndef _ASMLANGUAGE
#include <sys/slist.h>
#include <zephyr/sys/slist.h>
/* Page table entry data type at all levels. Defined here due to
* k_mem_partition_attr_t, eventually move to private x86_mmu.h

2
include/zephyr/arch/x86/thread_stack.h
View file

@ -6,7 +6,7 @@
#ifndef ZEPHYR_INCLUDE_ARCH_X86_THREAD_STACK_H
#define ZEPHYR_INCLUDE_ARCH_X86_THREAD_STACK_H
#include <arch/x86/mmustructs.h>
#include <zephyr/arch/x86/mmustructs.h>
#ifdef CONFIG_X86_64
#define ARCH_STACK_PTR_ALIGN 16UL

22
include/zephyr/arch/xtensa/arch.h
View file

@ -13,21 +13,21 @@
#ifndef ZEPHYR_INCLUDE_ARCH_XTENSA_ARCH_H_
#define ZEPHYR_INCLUDE_ARCH_XTENSA_ARCH_H_
#include <irq.h>
#include <zephyr/irq.h>
#include <zephyr/devicetree.h>
#if !defined(_ASMLANGUAGE) && !defined(__ASSEMBLER__)
#include <zephyr/types.h>
#include <toolchain.h>
#include <arch/common/sys_bitops.h>
#include <arch/common/sys_io.h>
#include <arch/common/ffs.h>
#include <sw_isr_table.h>
#include <arch/xtensa/thread.h>
#include <arch/xtensa/irq.h>
#include <zephyr/toolchain.h>
#include <zephyr/arch/common/sys_bitops.h>
#include <zephyr/arch/common/sys_io.h>
#include <zephyr/arch/common/ffs.h>
#include <zephyr/sw_isr_table.h>
#include <zephyr/arch/xtensa/thread.h>
#include <zephyr/arch/xtensa/irq.h>
#include <xtensa/config/core.h>
#include <arch/common/addr_types.h>
#include <arch/xtensa/gdbstub.h>
#include <zephyr/arch/common/addr_types.h>
#include <zephyr/arch/xtensa/gdbstub.h>
#ifdef CONFIG_KERNEL_COHERENCE
#define ARCH_STACK_PTR_ALIGN XCHAL_DCACHE_LINESIZE
@ -38,7 +38,7 @@
/* Xtensa GPRs are often designated by two different names */
#define sys_define_gpr_with_alias(name1, name2) union { uint32_t name1, name2; }
#include <arch/xtensa/exc.h>
#include <zephyr/arch/xtensa/exc.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/arch/xtensa/arch_inlines.h
View file

@ -10,7 +10,7 @@
#ifndef _ASMLANGUAGE
#include <kernel_structs.h>
#include <zephyr/kernel_structs.h>
#include <zsr.h>
#define RSR(sr) \

6
include/zephyr/arch/xtensa/cache.h
View file

@ -6,9 +6,9 @@
#define ZEPHYR_INCLUDE_ARCH_XTENSA_CACHE_H_
#include <xtensa/config/core-isa.h>
#include <toolchain.h>
#include <sys/util.h>
#include <debug/sparse.h>
#include <zephyr/toolchain.h>
#include <zephyr/sys/util.h>
#include <zephyr/debug/sparse.h>
#ifdef __cplusplus
extern "C" {

4
include/zephyr/arch/xtensa/irq.h
View file

@ -6,7 +6,7 @@
#ifndef ZEPHYR_INCLUDE_ARCH_XTENSA_XTENSA_IRQ_H_
#define ZEPHYR_INCLUDE_ARCH_XTENSA_XTENSA_IRQ_H_
#include <toolchain.h>
#include <zephyr/toolchain.h>
#include <xtensa/config/core-isa.h>
#define CONFIG_GEN_IRQ_START_VECTOR 0
@ -126,6 +126,6 @@ static ALWAYS_INLINE bool arch_irq_unlocked(unsigned int key)
extern int z_xtensa_irq_is_enabled(unsigned int irq);
#include <irq.h>
#include <zephyr/irq.h>
#endif /* ZEPHYR_INCLUDE_ARCH_XTENSA_XTENSA_IRQ_H_ */

2
include/zephyr/audio/codec.h
View file

@ -22,7 +22,7 @@
* @{
*/
#include <drivers/i2s.h>
#include <zephyr/drivers/i2s.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/audio/dmic.h
View file

@ -32,7 +32,7 @@
* @{
*/
#include <kernel.h>
#include <zephyr/kernel.h>
#include <zephyr/device.h>
#ifdef __cplusplus

2
include/zephyr/bluetooth/a2dp.h
View file

@ -10,7 +10,7 @@
#ifndef ZEPHYR_INCLUDE_BLUETOOTH_A2DP_H_
#define ZEPHYR_INCLUDE_BLUETOOTH_A2DP_H_
#include <bluetooth/avdtp.h>
#include <zephyr/bluetooth/avdtp.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/bluetooth/addr.h
View file

@ -11,7 +11,7 @@
#define ZEPHYR_INCLUDE_BLUETOOTH_ADDR_H_
#include <string.h>
#include <sys/printk.h>
#include <zephyr/sys/printk.h>
#include <zephyr/types.h>
#ifdef __cplusplus

4
include/zephyr/bluetooth/att.h
View file

@ -10,8 +10,8 @@
#ifndef ZEPHYR_INCLUDE_BLUETOOTH_ATT_H_
#define ZEPHYR_INCLUDE_BLUETOOTH_ATT_H_
#include <sys/slist.h>
#include <bluetooth/conn.h>
#include <zephyr/sys/slist.h>
#include <zephyr/bluetooth/conn.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/bluetooth/audio/aics.h
View file

@ -27,7 +27,7 @@
*/
#include <zephyr/types.h>
#include <bluetooth/bluetooth.h>
#include <zephyr/bluetooth/bluetooth.h>
#ifdef __cplusplus
extern "C" {

14
include/zephyr/bluetooth/audio/audio.h
View file

@ -11,13 +11,13 @@
#ifndef ZEPHYR_INCLUDE_BLUETOOTH_AUDIO_AUDIO_H_
#define ZEPHYR_INCLUDE_BLUETOOTH_AUDIO_AUDIO_H_
#include <sys/atomic.h>
#include <bluetooth/buf.h>
#include <bluetooth/conn.h>
#include <bluetooth/hci.h>
#include <bluetooth/iso.h>
#include <bluetooth/gatt.h>
#include <bluetooth/audio/lc3.h>
#include <zephyr/sys/atomic.h>
#include <zephyr/bluetooth/buf.h>
#include <zephyr/bluetooth/conn.h>
#include <zephyr/bluetooth/hci.h>
#include <zephyr/bluetooth/iso.h>
#include <zephyr/bluetooth/gatt.h>
#include <zephyr/bluetooth/audio/lc3.h>
/**
* @brief Bluetooth Audio

2
include/zephyr/bluetooth/audio/bass.h
View file

@ -10,7 +10,7 @@
#ifndef ZEPHYR_INCLUDE_BLUETOOTH_AUDIO_BASS_
#define ZEPHYR_INCLUDE_BLUETOOTH_AUDIO_BASS_
#include <zephyr/types.h>
#include <bluetooth/conn.h>
#include <zephyr/bluetooth/conn.h>
#if IS_ENABLED(CONFIG_BT_BASS)
#define BT_BASS_MAX_METADATA_LEN CONFIG_BT_BASS_MAX_METADATA_LEN

2
include/zephyr/bluetooth/audio/capabilities.h
View file

@ -10,7 +10,7 @@
#ifndef ZEPHYR_INCLUDE_BLUETOOTH_AUDIO_CAPABILITIES_H_
#define ZEPHYR_INCLUDE_BLUETOOTH_AUDIO_CAPABILITIES_H_
#include <bluetooth/audio/audio.h>
#include <zephyr/bluetooth/audio/audio.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/bluetooth/audio/csis.h
View file

@ -20,7 +20,7 @@
#include <zephyr/types.h>
#include <stdbool.h>
#include <bluetooth/conn.h>
#include <zephyr/bluetooth/conn.h>
#ifdef __cplusplus
extern "C" {

4
include/zephyr/bluetooth/audio/has.h
View file

@ -22,9 +22,9 @@
* ongoing development.
*/
#include <bluetooth/bluetooth.h>
#include <zephyr/bluetooth/bluetooth.h>
#include <sys/types.h>
#include <sys/util.h>
#include <zephyr/sys/util.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/bluetooth/audio/lc3.h
View file

@ -18,7 +18,7 @@
* @{
*/
#include <sys/util_macro.h>
#include <zephyr/sys/util_macro.h>
#ifdef __cplusplus
extern "C" {

6
include/zephyr/bluetooth/audio/mcc.h
View file

@ -22,9 +22,9 @@
#define ZEPHYR_INCLUDE_BLUETOOTH_AUDIO_MCC_
#include <zephyr/types.h>
#include <bluetooth/conn.h>
#include <net/buf.h>
#include <bluetooth/audio/media_proxy.h>
#include <zephyr/bluetooth/conn.h>
#include <zephyr/net/buf.h>
#include <zephyr/bluetooth/audio/media_proxy.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/bluetooth/audio/mcs.h
View file

@ -22,7 +22,7 @@
* Profile specifications.
*/
#include <sys/util.h>
#include <zephyr/sys/util.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/bluetooth/audio/media_proxy.h
View file

@ -38,7 +38,7 @@
#include <stdbool.h>
#include <zephyr/types.h>
#include <bluetooth/bluetooth.h>
#include <zephyr/bluetooth/bluetooth.h>
/* TODO: Remove dependency on mcs.h */
#include "mcs.h"

2
include/zephyr/bluetooth/audio/mics.h
View file

@ -20,7 +20,7 @@
*/
#include <zephyr/types.h>
#include <bluetooth/audio/aics.h>
#include <zephyr/bluetooth/audio/aics.h>
#ifdef __cplusplus
extern "C" {

2
include/zephyr/bluetooth/audio/tbs.h
View file

@ -11,7 +11,7 @@
#define ZEPHYR_INCLUDE_BLUETOOTH_AUDIO_TBS_H_
#include <zephyr/types.h>
#include <bluetooth/conn.h>
#include <zephyr/bluetooth/conn.h>
/* Call States */
#define BT_TBS_CALL_STATE_INCOMING 0x00

Some files were not shown because too many files have changed in this diff Show more