michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: arm: Fix header guards

Browse source 
Fix the header guards for the ARM header files to reflect the new code
location.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
This commit is contained in:
Carlo Caione 2019-11-09 18:48:15 +00:00 • committed by Anas Nashif
commit 13e671e381
23 changed files with 69 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu_dev.h
View file

@ -3,8 +3,8 @@
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_
#include <zephyr/types.h> #include <zephyr/types.h>
@ -268,4 +268,4 @@ int arm_core_mpu_buffer_validate(void *addr, size_t size, int write);
} }
#endif #endif
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_ */

6
arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v7_internal.h
View file

@ -5,8 +5,8 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#ifndef ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_ #ifndef ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_
#define ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_ #define ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_
#define LOG_LEVEL CONFIG_MPU_LOG_LEVEL #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
@ -316,4 +316,4 @@ static int mpu_configure_dynamic_mpu_regions(const struct k_mem_partition
return mpu_reg_index; return mpu_reg_index;
} }
#endif /* ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_ */ #endif /* ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_ */

6
arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v8_internal.h
View file

@ -5,8 +5,8 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#ifndef ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_ #ifndef ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_
#define ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_ #define ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_
#include <aarch32/cortex_m/cmse.h> #include <aarch32/cortex_m/cmse.h>
#define LOG_LEVEL CONFIG_MPU_LOG_LEVEL #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
@ -583,4 +583,4 @@ static int mpu_configure_dynamic_mpu_regions(const struct k_mem_partition
return mpu_reg_index; return mpu_reg_index;
} }
#endif /* ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_ */ #endif /* ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_ */

6
arch/arm/core/aarch32/cortex_m/vector_table.h
View file

@ -18,8 +18,8 @@
* No other symbol has the same format, so they are easy to spot. * No other symbol has the same format, so they are easy to spot.
*/ */
#ifndef ZEPHYR_ARCH_ARM_CORE_CORTEX_M_VECTOR_TABLE_H_ #ifndef ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_VECTOR_TABLE_H_
#define ZEPHYR_ARCH_ARM_CORE_CORTEX_M_VECTOR_TABLE_H_ #define ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_VECTOR_TABLE_H_
#ifdef _ASMLANGUAGE #ifdef _ASMLANGUAGE
@ -67,4 +67,4 @@ extern void *_vector_table[];
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_ARCH_ARM_CORE_CORTEX_M_VECTOR_TABLE_H_ */ #endif /* ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_VECTOR_TABLE_H_ */

6
arch/arm/include/aarch32/cortex_m/cmse.h
View file

@ -11,8 +11,8 @@
* CMSE API for Cortex-M23/M33 CPUs. * CMSE API for Cortex-M23/M33 CPUs.
*/ */
#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_CMSE_H_ #ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_CMSE_H_
#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_CMSE_H_ #define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_CMSE_H_
#ifdef _ASMLANGUAGE #ifdef _ASMLANGUAGE
@ -450,4 +450,4 @@ int arm_cmse_addr_range_nonsecure_readwrite_ok(u32_t addr, u32_t size,
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_CMSE_H_ */ #endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_CMSE_H_ */

6
arch/arm/include/aarch32/cortex_m/exc.h
View file

@ -11,8 +11,8 @@
* Exception/interrupt context helpers. * Exception/interrupt context helpers.
*/ */
#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_EXC_H_ #ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_EXC_H_
#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_EXC_H_ #define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_EXC_H_
#include <arch/cpu.h> #include <arch/cpu.h>
@ -157,4 +157,4 @@ static ALWAYS_INLINE void z_arm_clear_faults(void)
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_EXC_H_ */ #endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_EXC_H_ */

6
arch/arm/include/aarch32/cortex_m/stack.h
View file

@ -11,8 +11,8 @@
* Stack helper functions. * Stack helper functions.
*/ */
#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_STACK_H_ #ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_STACK_H_
#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_STACK_H_ #define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_STACK_H_
#ifdef _ASMLANGUAGE #ifdef _ASMLANGUAGE
@ -69,4 +69,4 @@ static ALWAYS_INLINE void z_arm_interrupt_stack_setup(void)
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_STACK_H_ */ #endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_STACK_H_ */

6
arch/arm/include/aarch32/cortex_m/tz.h
View file

@ -11,8 +11,8 @@
* TrustZone API for Cortex-M23/M33 CPUs implementing the Security Extension. * TrustZone API for Cortex-M23/M33 CPUs implementing the Security Extension.
*/ */
#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_TZ_H_ #ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_TZ_H_
#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_TZ_H_ #define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_TZ_H_
#ifdef _ASMLANGUAGE #ifdef _ASMLANGUAGE
@ -347,4 +347,4 @@ typedef void __attribute__((cmse_nonsecure_call)) (*tz_ns_func_ptr_t) (void);
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_TZ_H_ */ #endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_TZ_H_ */

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

@ -13,8 +13,8 @@
* (include/arm/cpu.h) * (include/arm/cpu.h)
*/ */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_H_
/* Add include for DTS generated information */ /* Add include for DTS generated information */
#include <generated_dts_board.h> #include <generated_dts_board.h>
@ -256,4 +256,4 @@ extern "C" {
} }
#endif #endif
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_H_ */

6
include/arch/arm/aarch32/asm_inline.h
View file

@ -6,8 +6,8 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_H_ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_H_
/* /*
* The file must not be included directly * The file must not be included directly
@ -20,4 +20,4 @@
#include <arch/arm/asm_inline_other.h> #include <arch/arm/asm_inline_other.h>
#endif #endif
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_H_ */

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

@ -8,8 +8,8 @@
/* Either public functions or macros or invoked by public functions */ /* Either public functions or macros or invoked by public functions */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_GCC_H_ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_GCC_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_GCC_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_GCC_H_
/* /*
* The file must not be included directly * The file must not be included directly
@ -112,4 +112,4 @@ static ALWAYS_INLINE bool arch_irq_unlocked(unsigned int key)
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_GCC_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_GCC_H_ */

6
include/arch/arm/aarch32/cortex_m/cmsis.h
View file

@ -11,8 +11,8 @@
* This header contains the interface to the ARM CMSIS Core headers. * This header contains the interface to the ARM CMSIS Core headers.
*/ */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CMSIS_H_ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_CMSIS_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CMSIS_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_CMSIS_H_
#include <soc.h> #include <soc.h>
@ -114,4 +114,4 @@ typedef enum {
#error "Unknown Cortex-M device" #error "Unknown Cortex-M device"
#endif #endif
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CMSIS_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_CMSIS_H_ */

6
include/arch/arm/aarch32/cortex_m/memory_map.h
View file

@ -12,8 +12,8 @@
* processors. * processors.
*/ */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MEMORY_MAP_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MEMORY_MAP_H_
#include <sys/util.h> #include <sys/util.h>
@ -107,4 +107,4 @@
#define _VENDOR_BASE_ADDR 0xE0100000 #define _VENDOR_BASE_ADDR 0xE0100000
#define _VENDOR_END_ADDR 0xFFFFFFFF #define _VENDOR_END_ADDR 0xFFFFFFFF
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MEMORY_MAP_H_ */

6
include/arch/arm/aarch32/cortex_m/mpu/arm_mpu.h
View file

@ -3,8 +3,8 @@
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_H_ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_H_
#if defined(CONFIG_CPU_CORTEX_M0PLUS) || \ #if defined(CONFIG_CPU_CORTEX_M0PLUS) || \
defined(CONFIG_CPU_CORTEX_M3) || \ defined(CONFIG_CPU_CORTEX_M3) || \
@ -57,4 +57,4 @@ extern const struct arm_mpu_config mpu_config;
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_H_ */

6
include/arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h
View file

@ -3,8 +3,8 @@
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_NXP_MPU_H_ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_NXP_MPU_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_NXP_MPU_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_NXP_MPU_H_
#ifndef _ASMLANGUAGE #ifndef _ASMLANGUAGE
@ -270,4 +270,4 @@ extern const struct nxp_mpu_config mpu_config;
"start address of the partition must align with minimum MPU \ "start address of the partition must align with minimum MPU \
region size.") region size.")
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_NXP_MPU_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_NXP_MPU_H_ */

6
include/arch/arm/aarch32/cortex_r/sys_io.h
View file

@ -9,8 +9,8 @@
* gcc builtins) * gcc builtins)
*/ */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_SYS_IO_H_ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_SYS_IO_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_
#ifndef _ASMLANGUAGE #ifndef _ASMLANGUAGE
@ -159,4 +159,4 @@ static ALWAYS_INLINE
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_SYS_IO_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_ */

6
include/arch/arm/aarch32/error.h
View file

@ -11,8 +11,8 @@
* ARM-specific kernel error handling interface. Included by arm/arch.h. * ARM-specific kernel error handling interface. Included by arm/arch.h.
*/ */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ERROR_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ERROR_H_
#include <arch/arm/aarch32/syscall.h> #include <arch/arm/aarch32/syscall.h>
#include <arch/arm/aarch32/exc.h> #include <arch/arm/aarch32/exc.h>
@ -62,4 +62,4 @@ do { \
} }
#endif #endif
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ERROR_H_ */

6
include/arch/arm/aarch32/exc.h
View file

@ -11,8 +11,8 @@
* ARM-specific kernel exception handling interface. Included by arm/arch.h. * ARM-specific kernel exception handling interface. Included by arm/arch.h.
*/ */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_EXC_H_ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_EXC_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_EXC_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_EXC_H_
/* for assembler, only works with constants */ /* for assembler, only works with constants */
#define Z_EXC_PRIO(pri) (((pri) << (8 - DT_NUM_IRQ_PRIO_BITS)) & 0xff) #define Z_EXC_PRIO(pri) (((pri) << (8 - DT_NUM_IRQ_PRIO_BITS)) & 0xff)
@ -72,4 +72,4 @@ extern void z_arm_exc_exit(void);
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_EXC_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_EXC_H_ */

6
include/arch/arm/aarch32/irq.h
View file

@ -11,8 +11,8 @@
* ARM-specific kernel interrupt handling interface. Included by arm/arch.h. * ARM-specific kernel interrupt handling interface. Included by arm/arch.h.
*/ */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_IRQ_H_ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_IRQ_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_IRQ_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_IRQ_H_
#include <irq.h> #include <irq.h>
#include <sw_isr_table.h> #include <sw_isr_table.h>
@ -153,4 +153,4 @@ extern void _isr_wrapper(void);
} }
#endif #endif
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_IRQ_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_IRQ_H_ */

6
include/arch/arm/aarch32/misc.h
View file

@ -11,8 +11,8 @@
* ARM-specific kernel miscellaneous interface. Included by arm/arch.h. * ARM-specific kernel miscellaneous interface. Included by arm/arch.h.
*/ */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_MISC_H_ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MISC_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_MISC_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MISC_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -37,4 +37,4 @@ static ALWAYS_INLINE void arch_nop(void)
} }
#endif #endif
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_MISC_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MISC_H_ */

6
include/arch/arm/aarch32/nmi.h
View file

@ -10,8 +10,8 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_NMI_H_ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_NMI_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_NMI_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_NMI_H_
#ifndef _ASMLANGUAGE #ifndef _ASMLANGUAGE
#ifdef CONFIG_RUNTIME_NMI #ifdef CONFIG_RUNTIME_NMI
@ -22,4 +22,4 @@ extern void z_arm_nmi_init(void);
#endif #endif
#endif #endif
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_NMI_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_NMI_H_ */

6
include/arch/arm/aarch32/syscall.h
View file

@ -13,8 +13,8 @@
* (include/arch/syscall.h) * (include/arch/syscall.h)
*/ */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_SYSCALL_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_SYSCALL_H_
#define _SVC_CALL_CONTEXT_SWITCH 0 #define _SVC_CALL_CONTEXT_SWITCH 0
#define _SVC_CALL_IRQ_OFFLOAD 1 #define _SVC_CALL_IRQ_OFFLOAD 1
@ -184,4 +184,4 @@ static inline bool arch_is_user_context(void)
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#endif /* CONFIG_USERSPACE */ #endif /* CONFIG_USERSPACE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_SYSCALL_H_ */

6
include/arch/arm/aarch32/thread.h
View file

@ -16,8 +16,8 @@
* necessary to instantiate instances of struct k_thread. * necessary to instantiate instances of struct k_thread.
*/ */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_THREAD_H_ #ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_THREAD_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_THREAD_H_ #define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_THREAD_H_
#ifndef _ASMLANGUAGE #ifndef _ASMLANGUAGE
#include <zephyr/types.h> #include <zephyr/types.h>
@ -92,4 +92,4 @@ typedef struct _thread_arch _thread_arch_t;
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_THREAD_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_THREAD_H_ */