diff options
Diffstat (limited to 'include/drivers/arm')
-rw-r--r-- | include/drivers/arm/cci.h | 4 | ||||
-rw-r--r-- | include/drivers/arm/ccn.h | 4 | ||||
-rw-r--r-- | include/drivers/arm/css/sds.h | 4 | ||||
-rw-r--r-- | include/drivers/arm/fvp/fvp_pwrc.h | 4 | ||||
-rw-r--r-- | include/drivers/arm/gicv2.h | 4 | ||||
-rw-r--r-- | include/drivers/arm/gicv3.h | 4 | ||||
-rw-r--r-- | include/drivers/arm/pl011.h | 4 | ||||
-rw-r--r-- | include/drivers/arm/sp805.h | 4 | ||||
-rw-r--r-- | include/drivers/arm/tzc400.h | 4 | ||||
-rw-r--r-- | include/drivers/arm/tzc_dmc500.h | 4 |
10 files changed, 20 insertions, 20 deletions
diff --git a/include/drivers/arm/cci.h b/include/drivers/arm/cci.h index c5ddcfd448..5aea95a0c0 100644 --- a/include/drivers/arm/cci.h +++ b/include/drivers/arm/cci.h @@ -100,7 +100,7 @@ #define SLAVE_IF_UNUSED -1 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> @@ -121,5 +121,5 @@ void cci_init(uintptr_t base, const int *map, unsigned int num_cci_masters); void cci_enable_snoop_dvm_reqs(unsigned int master_id); void cci_disable_snoop_dvm_reqs(unsigned int master_id); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CCI_H */ diff --git a/include/drivers/arm/ccn.h b/include/drivers/arm/ccn.h index 9c3abac6b1..7f737681ef 100644 --- a/include/drivers/arm/ccn.h +++ b/include/drivers/arm/ccn.h @@ -46,7 +46,7 @@ */ #define CCN_GET_RUN_STATE(pstate) (pstate & 0xf) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> /* @@ -109,5 +109,5 @@ unsigned long long ccn_read_node_reg(node_types_t node_type, unsigned int node_id, unsigned int reg_offset); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CCN_H */ diff --git a/include/drivers/arm/css/sds.h b/include/drivers/arm/css/sds.h index 114ae9258f..db4cbaaf56 100644 --- a/include/drivers/arm/css/sds.h +++ b/include/drivers/arm/css/sds.h @@ -70,7 +70,7 @@ #define SDS_ERR_STRUCT_NOT_FOUND -3 #define SDS_ERR_STRUCT_NOT_FINALIZED -4 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stddef.h> #include <stdint.h> @@ -85,6 +85,6 @@ int sds_struct_read(uint32_t structure_id, unsigned int fld_off, void *data, size_t size, sds_access_mode_t mode); int sds_struct_write(uint32_t structure_id, unsigned int fld_off, void *data, size_t size, sds_access_mode_t mode); -#endif /*__ASSEMBLY__ */ +#endif /*__ASSEMBLER__ */ #endif /* SDS_H */ diff --git a/include/drivers/arm/fvp/fvp_pwrc.h b/include/drivers/arm/fvp/fvp_pwrc.h index ca173f36f8..39e2516201 100644 --- a/include/drivers/arm/fvp/fvp_pwrc.h +++ b/include/drivers/arm/fvp/fvp_pwrc.h @@ -35,7 +35,7 @@ #define PSYSR_INVALID U(0xffffffff) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> @@ -50,6 +50,6 @@ void fvp_pwrc_clr_wen(u_register_t mpidr); unsigned int fvp_pwrc_read_psysr(u_register_t mpidr); unsigned int fvp_pwrc_get_cpu_wkr(u_register_t mpidr); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* FVP_PWRC_H */ diff --git a/include/drivers/arm/gicv2.h b/include/drivers/arm/gicv2.h index 6bc5101d13..ebcb216d6b 100644 --- a/include/drivers/arm/gicv2.h +++ b/include/drivers/arm/gicv2.h @@ -116,7 +116,7 @@ /* Interrupt ID mask for HPPIR, AHPPIR, IAR and AIAR CPU Interface registers */ #define INT_ID_MASK U(0x3ff) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <cdefs.h> #include <stdint.h> @@ -184,5 +184,5 @@ void gicv2_clear_interrupt_pending(unsigned int id); unsigned int gicv2_set_pmr(unsigned int mask); void gicv2_interrupt_set_cfg(unsigned int id, unsigned int cfg); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* GICV2_H */ diff --git a/include/drivers/arm/gicv3.h b/include/drivers/arm/gicv3.h index 72221acb0f..9c72d4dff3 100644 --- a/include/drivers/arm/gicv3.h +++ b/include/drivers/arm/gicv3.h @@ -208,7 +208,7 @@ #define GITS_CTLR_QUIESCENT_SHIFT 31 #define GITS_CTLR_QUIESCENT_BIT BIT_32(GITS_CTLR_QUIESCENT_SHIFT) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdbool.h> #include <stdint.h> @@ -406,5 +406,5 @@ void gicv3_set_interrupt_pending(unsigned int id, unsigned int proc_num); void gicv3_clear_interrupt_pending(unsigned int id, unsigned int proc_num); unsigned int gicv3_set_pmr(unsigned int mask); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* GICV3_H */ diff --git a/include/drivers/arm/pl011.h b/include/drivers/arm/pl011.h index f201f0048f..8733d19640 100644 --- a/include/drivers/arm/pl011.h +++ b/include/drivers/arm/pl011.h @@ -83,7 +83,7 @@ #define CONSOLE_T_PL011_BASE CONSOLE_T_DRVDATA -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> @@ -101,6 +101,6 @@ typedef struct { int console_pl011_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud, console_pl011_t *console); -#endif /*__ASSEMBLY__*/ +#endif /*__ASSEMBLER__*/ #endif /* PL011_H */ diff --git a/include/drivers/arm/sp805.h b/include/drivers/arm/sp805.h index 551bfe4bae..b00ede1d6d 100644 --- a/include/drivers/arm/sp805.h +++ b/include/drivers/arm/sp805.h @@ -21,7 +21,7 @@ #define SP805_CTR_RESEN (U(1) << 1) #define SP805_CTR_INTEN (U(1) << 0) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> @@ -31,6 +31,6 @@ void sp805_start(uintptr_t base, unsigned int ticks); void sp805_stop(uintptr_t base); void sp805_refresh(uintptr_t base, unsigned int ticks); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* SP805_H */ diff --git a/include/drivers/arm/tzc400.h b/include/drivers/arm/tzc400.h index 98ef0ec1e0..32aeb03502 100644 --- a/include/drivers/arm/tzc400.h +++ b/include/drivers/arm/tzc400.h @@ -93,7 +93,7 @@ #define TZC_400_REGION_SIZE U(0x20) #define TZC_400_ACTION_OFF U(0x4) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <cdefs.h> #include <stdint.h> @@ -154,6 +154,6 @@ static inline void tzc_disable_filters(void) tzc400_disable_filters(); } -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* TZC400_H */ diff --git a/include/drivers/arm/tzc_dmc500.h b/include/drivers/arm/tzc_dmc500.h index 24bfaeb145..cce074cb9b 100644 --- a/include/drivers/arm/tzc_dmc500.h +++ b/include/drivers/arm/tzc_dmc500.h @@ -121,7 +121,7 @@ /* Length of registers for configuring each region */ #define TZC_DMC500_REGION_SIZE U(0x018) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> @@ -147,5 +147,5 @@ void tzc_dmc500_config_complete(void); int tzc_dmc500_verify_complete(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* TZC_DMC500_H */ |