Commit c3cf06f1 authored by Antonio Nino Diaz's avatar Antonio Nino Diaz
Browse files

Standardise header guards across codebase



All identifiers, regardless of use, that start with two underscores are
reserved. This means they can't be used in header guards.

The style that this project is now to use the full name of the file in
capital letters followed by 'H'. For example, for a file called
"uart_example.h", the header guard is UART_EXAMPLE_H.

The exceptions are files that are imported from other projects:

- CryptoCell driver
- dt-bindings folders
- zlib headers

Change-Id: I50561bf6c88b491ec440d0c8385c74650f3c106e
Signed-off-by: default avatarAntonio Nino Diaz <antonio.ninodiaz@arm.com>
parent f5ae1b0e
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef __TEGRA_PRIVATE_H__
#define __TEGRA_PRIVATE_H__
#ifndef TEGRA_PRIVATE_H
#define TEGRA_PRIVATE_H
#include <arch.h>
#include <platform_def.h>
......@@ -112,4 +112,4 @@ void tegra_delay_timer_init(void);
void tegra_secure_entrypoint(void);
void tegra186_cpu_reset_handler(void);
#endif /* __TEGRA_PRIVATE_H__ */
#endif /* TEGRA_PRIVATE_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef __MCE_PRIVATE_H__
#define __MCE_PRIVATE_H__
#ifndef MCE_PRIVATE_H
#define MCE_PRIVATE_H
#include <mmio.h>
#include <tegra_def.h>
......@@ -258,4 +258,4 @@ int32_t nvg_cc3_ctrl(uint32_t ari_base, uint32_t freq, uint32_t volt, uint8_t en
extern void nvg_set_request_data(uint64_t req, uint64_t data);
extern void nvg_set_request(uint64_t req);
extern uint64_t nvg_get_result(void);
#endif /* __MCE_PRIVATE_H__ */
#endif /* MCE_PRIVATE_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef T18X_TEGRA_ARI_H
#define T18X_TEGRA_ARI_H
#ifndef T18X_ARI_H
#define T18X_ARI_H
/*
* ----------------------------------------------------------------------------
......@@ -434,4 +434,4 @@ typedef enum {
TEGRA_NVG_CHANNEL_LAST_INDEX,
} tegra_nvg_channel_id_t;
#endif /* T18X_TEGRA_ARI_H */
#endif /* T18X_ARI_H */
......@@ -3,8 +3,8 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef __PLAT_MACROS_S__
#define __PLAT_MACROS_S__
#ifndef PLAT_MACROS_S
#define PLAT_MACROS_S
#include <arm_macros.S>
#include <platform_def.h>
......@@ -23,4 +23,4 @@
arm_print_gic_regs
.endm
#endif /* __PLAT_MACROS_S__ */
#endif /* PLAT_MACROS_S */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef __QEMU_PRIVATE_H
#define __QEMU_PRIVATE_H
#ifndef QEMU_PRIVATE_H
#define QEMU_PRIVATE_H
#include <stdint.h>
......@@ -35,4 +35,4 @@ int dt_add_psci_cpu_enable_methods(void *fdt);
void qemu_console_init(void);
#endif /*__QEMU_PRIVATE_H*/
#endif /* QEMU_PRIVATE_H */
......@@ -3,8 +3,8 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef __RCAR_PLAT_LD_S__
#define __RCAR_PLAT_LD_S__
#ifndef RCAR_PLAT_LD_S
#define RCAR_PLAT_LD_S
#include <platform_def.h>
#include <xlat_tables_defs.h>
......@@ -33,4 +33,4 @@ SECTIONS
}
#endif /* __RCAR_PLAT_LD_S__ */
#endif /* RCAR_PLAT_LD_S */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef PLATFORM_DEF_H__
#define PLATFORM_DEF_H__
#ifndef PLATFORM_DEF_H
#define PLATFORM_DEF_H
#include <arch.h>
#ifndef __ASSEMBLY__
......@@ -186,4 +186,4 @@
#define PLAT_PCPU_DATA_SIZE (2)
#endif
#endif
#endif /* PLATFORM_DEF_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef RCAR_DEF_H__
#define RCAR_DEF_H__
#ifndef RCAR_DEF_H
#define RCAR_DEF_H
#include <tbbr_img_def.h>
#include <utils_def.h>
......@@ -290,4 +290,4 @@
#define LOSSY_FMT2 LOSSY_FMT_YUV422INTLV
#define LOSSY_ENA_DIS2 LOSSY_DISABLE
#endif
#endif /* RCAR_DEF_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef RCAR_PRIVATE_H__
#define RCAR_PRIVATE_H__
#ifndef RCAR_PRIVATE_H
#define RCAR_PRIVATE_H
#include <bakery_lock.h>
#include <bl_common.h>
......@@ -98,4 +98,4 @@ void plat_cci_init(void);
void mstpcr_write(uint32_t mstpcr, uint32_t mstpsr, uint32_t target_bit);
void cpg_write(uintptr_t regadr, uint32_t regval);
#endif
#endif /* RCAR_PRIVATE_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef RCAR_VERSION_H__
#define RCAR_VERSION_H__
#ifndef RCAR_VERSION_H
#define RCAR_VERSION_H
#include <arch_helpers.h>
......@@ -14,4 +14,4 @@
extern const uint8_t version_of_renesas[VERSION_OF_RENESAS_MAXLEN];
#endif
#endif /* RCAR_VERSION_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef AXI_REGISTER_H__
#define AXI_REGISTER_H__
#ifndef AXI_REGISTERS_H
#define AXI_REGISTERS_H
/* AXI registers */
......@@ -243,4 +243,4 @@
/* EDC edc interrupt enable 1 */
#define EDC_EDCINTEN1 (EDC_BASE + 0x0044U)
#endif
#endif /* AXI_REGISTERS_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef CPG_REGISTER_H__
#define CPG_REGISTER_H__
#ifndef CPG_REGISTERS_H
#define CPG_REGISTERS_H
/* CPG base address */
#define CPG_BASE (0xE6150000U)
......@@ -133,4 +133,4 @@
/* System Module Stop Control Register 11 */
#define SMSTPCR11 (CPG_BASE + 0x099CU)
#endif
#endif /* CPG_REGISTERS_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef LIFEC_REGISTER_H__
#define LIFEC_REGISTER_H__
#ifndef LIFEC_REGISTERS_H
#define LIFEC_REGISTERS_H
#define LIFEC_SEC_BASE (0xE6110000U)
......@@ -141,4 +141,4 @@
#define SAFE_READONLY14 (LIFEC_SAFE_BASE + 0x0210U)
#define SAFE_READONLY15 (LIFEC_SAFE_BASE + 0x0214U)
#endif
#endif /* LIFEC_REGISTERS_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef __PARAMETER_H__
#define __PARAMETER_H__
#ifndef DDR_PARAMETER_H
#define DDR_PARAMETER_H
#include <arch_helpers.h>
#include <console.h>
......@@ -38,4 +38,4 @@ struct param_ddr_usage {
struct param_ddr_usage ddr_region_usage_parse(uint64_t addr, uint64_t max_mb);
#endif /* __PARAMETER_H__ */
#endif /* DDR_PARAMETER_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef __PMU_COM_H__
#define __PMU_COM_H__
#ifndef PMU_COM_H
#define PMU_COM_H
#ifndef CHECK_CPU_WFIE_BASE
#define CHECK_CPU_WFIE_BASE (PMU_BASE + PMU_CORE_PWR_ST)
......@@ -108,4 +108,4 @@ static int check_cpu_wfie(uint32_t cpu_id, uint32_t wfie_msk)
return 0;
}
#endif /* __PMU_COM_H__ */
#endif /* PMU_COM_H */
......@@ -3,8 +3,8 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef __ROCKCHIP_PLAT_MACROS_S__
#define __ROCKCHIP_PLAT_MACROS_S__
#ifndef ROCKCHIP_PLAT_MACROS_S
#define ROCKCHIP_PLAT_MACROS_S
#include <cci.h>
#include <gic_common.h>
......@@ -115,4 +115,4 @@ exit_print_gic_regs:
#endif
.endm
#endif /* __ROCKCHIP_PLAT_MACROS_S__ */
#endif /* ROCKCHIP_PLAT_MACROS_S */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef __PLAT_PARAMS_H__
#define __PLAT_PARAMS_H__
#ifndef PLAT_PARAMS_H
#define PLAT_PARAMS_H
#include <stdint.h>
......@@ -95,4 +95,4 @@ struct bl31_u64_param {
uint64_t value;
};
#endif /* __PLAT_PARAMS_H__ */
#endif /* PLAT_PARAMS_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef __PLAT_PRIVATE_H__
#define __PLAT_PRIVATE_H__
#ifndef PLAT_PRIVATE_H
#define PLAT_PRIVATE_H
#ifndef __ASSEMBLY__
#include <mmio.h>
......@@ -143,4 +143,4 @@ void rockchip_plat_mmu_el3(void);
#define PMU_CPU_AUTO_PWRDN 0xf0
#define PMU_CLST_RET 0xa5
#endif /* __PLAT_PRIVATE_H__ */
#endif /* PLAT_PRIVATE_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef __ROCKCHIP_SIP_SVC_H__
#define __ROCKCHIP_SIP_SVC_H__
#ifndef ROCKCHIP_SIP_SVC_H
#define ROCKCHIP_SIP_SVC_H
/* SMC function IDs for SiP Service queries */
#define SIP_SVC_CALL_COUNT 0x8200ff00
......@@ -24,4 +24,4 @@ enum {
RK_SIP_E_INVALID_PARAM = -1
};
#endif
#endif /* ROCKCHIP_SIP_SVC_H */
......@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef __PMU_H__
#define __PMU_H__
#ifndef PMU_H
#define PMU_H
#include <soc.h>
......@@ -128,4 +128,4 @@ enum pmu_sft_con {
#define UART_INT_DISABLE 0x00
#define UART_FIFO_RESET 0x07
#endif /* __PMU_H__ */
#endif /* PMU_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment