ArmPkg: Fix Ecc error 8003

This patch fixes the following Ecc reported error:
The #ifndef at the start of an include file should have
one postfix underscore, and no prefix underscore character

Some include guards have been modified to match the name of the
header file. Some comments have also been added on the closing
'#endif'.

Cc: Bret Barkelew <bret.barkelew@microsoft.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

diff --git a/ArmPkg/Drivers/ArmGic/ArmGicDxe.h b/ArmPkg/Drivers/ArmGic/ArmGicDxe.h
index bf067ae03e08c615d72dceefca2827a9e02b059f..c78b788ac0127d5a5835b51f4943775de2d5d17c 100644 (file)
--- a/ArmPkg/Drivers/ArmGic/ArmGicDxe.h
+++ b/ArmPkg/Drivers/ArmGic/ArmGicDxe.h
@@ -6,8 +6,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 --*/\r
 \r
-#ifndef __ARM_GIC_DXE_H__\r
-#define __ARM_GIC_DXE_H__\r
+#ifndef ARM_GIC_DXE_H_\r
+#define ARM_GIC_DXE_H_\r
 \r
 #include <Library/ArmGicLib.h>\r
 #include <Library/ArmLib.h>\r
@@ -76,4 +76,4 @@ GicGetDistributorIcfgBaseAndBit (
   OUT UINTN                               *Config1Bit\r
   );\r
 \r
-#endif\r
+#endif // ARM_GIC_DXE_H_\r

diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.h b/ArmPkg/Drivers/CpuDxe/CpuDxe.h
index 3fe5c24d5e5b28fe2e0e31cd0355ff2d68da3fb4..4cf3ab258c245965b083c9244ebec336fdbaa245 100644 (file)
--- a/ArmPkg/Drivers/CpuDxe/CpuDxe.h
+++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.h
@@ -7,8 +7,8 @@
 \r
 **/\r
 \r
-#ifndef __CPU_DXE_ARM_EXCEPTION_H__\r
-#define __CPU_DXE_ARM_EXCEPTION_H__\r
+#ifndef CPU_DXE_H_\r
+#define CPU_DXE_H_\r
 \r
 #include <Uefi.h>\r
 \r
@@ -143,4 +143,4 @@ SetGcdMemorySpaceAttributes (
   IN UINT64                              Attributes\r
   );\r
 \r
-#endif // __CPU_DXE_ARM_EXCEPTION_H__\r
+#endif // CPU_DXE_H_\r

diff --git a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h
index c64bc5c4627d5bf00ce6a0096ed7153034fce4e6..28db57e07bdf00b39c94ca6271dc6661f416fd2d 100644 (file)
--- a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h
+++ b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h
@@ -5,8 +5,8 @@
 *  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 *\r
 **/\r
-#ifndef __GENERIC_WATCHDOG_H__\r
-#define __GENERIC_WATCHDOG_H__\r
+#ifndef GENERIC_WATCHDOG_H_\r
+#define GENERIC_WATCHDOG_H_\r
 \r
 // Refresh Frame:\r
 #define GENERIC_WDOG_REFRESH_REG              ((UINTN)FixedPcdGet64 (PcdGenericWatchdogRefreshBase) + 0x000)\r
@@ -21,4 +21,4 @@
 #define GENERIC_WDOG_ENABLED          1\r
 #define GENERIC_WDOG_DISABLED         0\r
 \r
-#endif  // __GENERIC_WATCHDOG_H__\r
+#endif  // GENERIC_WATCHDOG_H_\r

diff --git a/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.h b/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.h
index ce92fe9f1b9196c98c9d5ea3f2c16bfada04319b..5fe7c5f4d4e3152452408a771adfaa5b43181771 100644 (file)
--- a/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.h
+++ b/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.h
@@ -7,8 +7,8 @@
 \r
 **/\r
 \r
-#ifndef __SEMIHOST_FS_H__\r
-#define __SEMIHOST_FS_H__\r
+#ifndef SEMIHOST_FS_H_\r
+#define SEMIHOST_FS_H_\r
 \r
 EFI_STATUS\r
 VolumeOpen (\r
@@ -242,5 +242,5 @@ FileFlush (
   IN EFI_FILE *File\r
   );\r
 \r
-#endif // __SEMIHOST_FS_H__\r
+#endif // SEMIHOST_FS_H_\r
 \r

diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/ArmPkg/Include/AsmMacroIoLib.h
index e3576c8beb6e4cdddd6d462a5a98fe061acdeb12..6c901ac3871bb056940089287e7abef957164793 100644 (file)
--- a/ArmPkg/Include/AsmMacroIoLib.h
+++ b/ArmPkg/Include/AsmMacroIoLib.h
@@ -10,8 +10,8 @@
 **/\r
 \r
 \r
-#ifndef __MACRO_IO_LIB_H__\r
-#define __MACRO_IO_LIB_H__\r
+#ifndef ASM_MACRO_IO_LIB_H_\r
+#define ASM_MACRO_IO_LIB_H_\r
 \r
 #define _ASM_FUNC(Name, Section)    \\r
   .global   Name                  ; \\r
@@ -36,4 +36,4 @@
   movt      Reg, #:upper16:(Sym) - (. + 12) ; \\r
   ldr       Reg, [pc, Reg]\r
 \r
-#endif\r
+#endif // ASM_MACRO_IO_LIB_H_\r

diff --git a/ArmPkg/Include/AsmMacroIoLibV8.h b/ArmPkg/Include/AsmMacroIoLibV8.h
index bcc0d8dafe0c9759122a5a06da684c04e2050744..337d9ae0168e4b7dc90260d691293a55b27c75d9 100644 (file)
--- a/ArmPkg/Include/AsmMacroIoLibV8.h
+++ b/ArmPkg/Include/AsmMacroIoLibV8.h
@@ -10,8 +10,8 @@
 **/\r
 \r
 \r
-#ifndef __MACRO_IO_LIBV8_H__\r
-#define __MACRO_IO_LIBV8_H__\r
+#ifndef ASM_MACRO_IO_LIBV8_H_\r
+#define ASM_MACRO_IO_LIBV8_H_\r
 \r
 // CurrentEL : 0xC = EL3; 8 = EL2; 4 = EL1\r
 // This only selects between EL1 and EL2, else we die.\r
@@ -54,4 +54,4 @@
   movk      Reg, ((Val) >> 16) & 0xffff, lsl #16  ; \\r
   movk      Reg, (Val) & 0xffff\r
 \r
-#endif // __MACRO_IO_LIBV8_H__\r
+#endif // ASM_MACRO_IO_LIBV8_H_\r

diff --git a/ArmPkg/Include/Chipset/AArch64.h b/ArmPkg/Include/Chipset/AArch64.h
index 09d4cfe28da7b5583654ebc984713db273ac5272..10aeb9a15ad8e96e56536f6edeea86b8ff774c8e 100644 (file)
--- a/ArmPkg/Include/Chipset/AArch64.h
+++ b/ArmPkg/Include/Chipset/AArch64.h
@@ -7,8 +7,8 @@
 \r
 **/\r
 \r
-#ifndef __AARCH64_H__\r
-#define __AARCH64_H__\r
+#ifndef AARCH64_H_\r
+#define AARCH64_H_\r
 \r
 #include <Chipset/AArch64Mmu.h>\r
 \r
@@ -238,4 +238,4 @@ ArmWriteCntHctl (
   IN UINT32 CntHctl\r
   );\r
 \r
-#endif // __AARCH64_H__\r
+#endif // AARCH64_H_\r

diff --git a/ArmPkg/Include/Chipset/AArch64Mmu.h b/ArmPkg/Include/Chipset/AArch64Mmu.h
index 6c7ada16b18ace0e61cf222b78ac1a5ba20cbf47..fe38ba1c50ce528148101644b981a4ad4957bb8d 100644 (file)
--- a/ArmPkg/Include/Chipset/AArch64Mmu.h
+++ b/ArmPkg/Include/Chipset/AArch64Mmu.h
@@ -6,8 +6,8 @@
 *\r
 **/\r
 \r
-#ifndef __AARCH64_MMU_H_\r
-#define __AARCH64_MMU_H_\r
+#ifndef AARCH64_MMU_H_\r
+#define AARCH64_MMU_H_\r
 \r
 //\r
 // Memory Attribute Indirection register Definitions\r
@@ -194,5 +194,5 @@
 \r
 // Uses LPAE Page Table format\r
 \r
-#endif // __AARCH64_MMU_H_\r
+#endif // AARCH64_MMU_H_\r
 \r

diff --git a/ArmPkg/Include/Chipset/ArmCortexA9.h b/ArmPkg/Include/Chipset/ArmCortexA9.h
index 13d18e5893dd2dcaf8596ec9fb0902dce6599db7..cb937ebc8c8bb97bba4cb4cfb7357a3e8f1f8c62 100644 (file)
--- a/ArmPkg/Include/Chipset/ArmCortexA9.h
+++ b/ArmPkg/Include/Chipset/ArmCortexA9.h
@@ -6,8 +6,8 @@
 \r
 **/\r
 \r
-#ifndef __ARM_CORTEX_A9_H__\r
-#define __ARM_CORTEX_A9_H__\r
+#ifndef ARM_CORTEX_A9_H_\r
+#define ARM_CORTEX_A9_H_\r
 \r
 #include <Chipset/ArmV7.h>\r
 \r
@@ -55,5 +55,5 @@ ArmGetScuBaseAddress (
   VOID\r
   );\r
 \r
-#endif\r
+#endif // ARM_CORTEX_A9_H_\r
 \r

diff --git a/ArmPkg/Include/Chipset/ArmV7.h b/ArmPkg/Include/Chipset/ArmV7.h
index 025f87a56d1699ebc33a9ee763ff5d77372773f7..6b20b988e364d4f01e5edb5b9d7a46ed7f35567a 100644 (file)
--- a/ArmPkg/Include/Chipset/ArmV7.h
+++ b/ArmPkg/Include/Chipset/ArmV7.h
@@ -7,8 +7,8 @@
 \r
 **/\r
 \r
-#ifndef __ARM_V7_H__\r
-#define __ARM_V7_H__\r
+#ifndef ARM_V7_H_\r
+#define ARM_V7_H_\r
 \r
 #include <Chipset/ArmV7Mmu.h>\r
 \r
@@ -120,4 +120,4 @@ ArmWriteNsacr (
   IN  UINT32   Nsacr\r
   );\r
 \r
-#endif // __ARM_V7_H__\r
+#endif // ARM_V7_H_\r

diff --git a/ArmPkg/Include/Chipset/ArmV7Mmu.h b/ArmPkg/Include/Chipset/ArmV7Mmu.h
index 25d82d02979549c8c773aaf3c7d8a62c54fe7447..87c443df3fcef0a81a229ea4bf85b9701de6989e 100644 (file)
--- a/ArmPkg/Include/Chipset/ArmV7Mmu.h
+++ b/ArmPkg/Include/Chipset/ArmV7Mmu.h
@@ -6,8 +6,8 @@
 *\r
 **/\r
 \r
-#ifndef __ARMV7_MMU_H_\r
-#define __ARMV7_MMU_H_\r
+#ifndef ARMV7_MMU_H_\r
+#define ARMV7_MMU_H_\r
 \r
 #define TTBR_NOT_OUTER_SHAREABLE             BIT5\r
 #define TTBR_RGN_OUTER_NON_CACHEABLE         0\r
@@ -235,4 +235,4 @@ ConvertSectionAttributesToPageAttributes (
   IN BOOLEAN  IsLargePage\r
   );\r
 \r
-#endif\r
+#endif // ARMV7_MMU_H_\r

diff --git a/ArmPkg/Include/Guid/ArmMpCoreInfo.h b/ArmPkg/Include/Guid/ArmMpCoreInfo.h
index 3f9d17bb72c0b738459432b6b958b36edf0ff720..b810767879ae20194ac70fdebff13d7fc8303eb4 100644 (file)
--- a/ArmPkg/Include/Guid/ArmMpCoreInfo.h
+++ b/ArmPkg/Include/Guid/ArmMpCoreInfo.h
@@ -6,8 +6,8 @@
 *\r
 **/\r
 \r
-#ifndef __ARM_MP_CORE_INFO_GUID_H_\r
-#define __ARM_MP_CORE_INFO_GUID_H_\r
+#ifndef ARM_MP_CORE_INFO_GUID_H_\r
+#define ARM_MP_CORE_INFO_GUID_H_\r
 \r
 #define MAX_CPUS_PER_MPCORE_SYSTEM    0x04\r
 #define SCU_CONFIG_REG_OFFSET         0x04\r
@@ -57,4 +57,4 @@ typedef struct {
 \r
 extern EFI_GUID gArmMpCoreInfoGuid;\r
 \r
-#endif /* MPCOREINFO_H_ */\r
+#endif /* ARM_MP_CORE_INFO_GUID_H_ */\r

diff --git a/ArmPkg/Include/IndustryStandard/ArmMmSvc.h b/ArmPkg/Include/IndustryStandard/ArmMmSvc.h
index 71a5398558b81e20c6c49e32454453297f798041..33d60ccf17bcea0897a0d186ec308a129a36cd78 100644 (file)
--- a/ArmPkg/Include/IndustryStandard/ArmMmSvc.h
+++ b/ArmPkg/Include/IndustryStandard/ArmMmSvc.h
@@ -6,8 +6,8 @@
 *\r
 **/\r
 \r
-#ifndef __ARM_MM_SVC_H__\r
-#define __ARM_MM_SVC_H__\r
+#ifndef ARM_MM_SVC_H_\r
+#define ARM_MM_SVC_H_\r
 \r
 /*\r
  * SVC IDs to allow the MM secure partition to initialise itself, handle\r
@@ -44,4 +44,4 @@
 #define SPM_MAJOR_VERSION                     0\r
 #define SPM_MINOR_VERSION                     1\r
 \r
-#endif\r
+#endif // ARM_MM_SVC_H_\r

diff --git a/ArmPkg/Include/IndustryStandard/ArmStdSmc.h b/ArmPkg/Include/IndustryStandard/ArmStdSmc.h
index 9e0a3a3960d5361c839c3b27953dee2891ebaa86..67afb0ea2d3da9f4d1f73903de5d48bb766589bd 100644 (file)
--- a/ArmPkg/Include/IndustryStandard/ArmStdSmc.h
+++ b/ArmPkg/Include/IndustryStandard/ArmStdSmc.h
@@ -10,8 +10,8 @@
 *    (https://developer.arm.com/documentation/den0028/c/?lang=en)\r
 **/\r
 \r
-#ifndef __ARM_STD_SMC_H__\r
-#define __ARM_STD_SMC_H__\r
+#ifndef ARM_STD_SMC_H_\r
+#define ARM_STD_SMC_H_\r
 \r
 /*\r
  * SMC function IDs for Standard Service queries\r
@@ -129,4 +129,4 @@
 /*                                    0xbf00ff02 is reserved */\r
 #define ARM_SMC_ID_TOS_REVISION       0xbf00ff03\r
 \r
-#endif\r
+#endif // ARM_STD_SMC_H_\r

diff --git a/ArmPkg/Include/Library/ArmDisassemblerLib.h b/ArmPkg/Include/Library/ArmDisassemblerLib.h
index c103b72e81277fe8f9b9dd76ee81da3d6fe7ec5a..d8c7af029dd349f2d0ef600e7a7297b9971f38d5 100644 (file)
--- a/ArmPkg/Include/Library/ArmDisassemblerLib.h
+++ b/ArmPkg/Include/Library/ArmDisassemblerLib.h
@@ -6,8 +6,8 @@
 \r
 **/\r
 \r
-#ifndef __ARM_DISASSEBLER_LIB_H__\r
-#define __ARM_DISASSEBLER_LIB_H__\r
+#ifndef ARM_DISASSEMBLER_LIB_H_\r
+#define ARM_DISASSEMBLER_LIB_H_\r
 \r
 /**\r
   Place a disassembly of **OpCodePtr into buffer, and update OpCodePtr to\r
@@ -34,4 +34,4 @@ DisassembleInstruction (
   OUT UINTN     Size\r
   );\r
 \r
-#endif\r
+#endif // ARM_DISASSEMBLER_LIB_H_\r

diff --git a/ArmPkg/Include/Library/ArmGenericTimerCounterLib.h b/ArmPkg/Include/Library/ArmGenericTimerCounterLib.h
index d3051be30f2da37deb98a98e999b2dd3189114fd..96bdffbf1ee3c9a7896164f022013ed29b578509 100644 (file)
--- a/ArmPkg/Include/Library/ArmGenericTimerCounterLib.h
+++ b/ArmPkg/Include/Library/ArmGenericTimerCounterLib.h
@@ -7,8 +7,8 @@
 \r
 **/\r
 \r
-#ifndef __ARM_GENERIC_TIMER_COUNTER_LIB_H__\r
-#define __ARM_GENERIC_TIMER_COUNTER_LIB_H__\r
+#ifndef ARM_GENERIC_TIMER_COUNTER_LIB_H_\r
+#define ARM_GENERIC_TIMER_COUNTER_LIB_H_\r
 \r
 VOID\r
 EFIAPI\r
@@ -82,4 +82,4 @@ ArmGenericTimerSetCompareVal (
   IN   UINT64   Value\r
   );\r
 \r
-#endif\r
+#endif // ARM_GENERIC_TIMER_COUNTER_LIB_H_\r

diff --git a/ArmPkg/Include/Library/ArmGicArchLib.h b/ArmPkg/Include/Library/ArmGicArchLib.h
index 264322f1d0dfe896773271873bbcd7cf60a34ae4..b3635d226866dbebd328ff264ef1922084686a5c 100644 (file)
--- a/ArmPkg/Include/Library/ArmGicArchLib.h
+++ b/ArmPkg/Include/Library/ArmGicArchLib.h
@@ -6,8 +6,8 @@
 *\r
 **/\r
 \r
-#ifndef __ARM_GIC_ARCH_LIB_H__\r
-#define __ARM_GIC_ARCH_LIB_H__\r
+#ifndef ARM_GIC_ARCH_LIB_H_\r
+#define ARM_GIC_ARCH_LIB_H_\r
 \r
 //\r
 // GIC definitions\r
@@ -24,4 +24,4 @@ ArmGicGetSupportedArchRevision (
   VOID\r
   );\r
 \r
-#endif\r
+#endif // ARM_GIC_ARCH_LIB_H_\r

diff --git a/ArmPkg/Include/Library/ArmHvcLib.h b/ArmPkg/Include/Library/ArmHvcLib.h
index d26f0cff31eb6a7ae623c683bf04f0f7651a9b36..d202c2af6ee39140122ee4b0e3ac7bf7e22ea1c4 100644 (file)
--- a/ArmPkg/Include/Library/ArmHvcLib.h
+++ b/ArmPkg/Include/Library/ArmHvcLib.h
@@ -6,8 +6,8 @@
 *\r
 **/\r
 \r
-#ifndef __ARM_HVC_LIB__\r
-#define __ARM_HVC_LIB__\r
+#ifndef ARM_HVC_LIB_H_\r
+#define ARM_HVC_LIB_H_\r
 \r
 /**\r
  * The size of the HVC arguments are different between AArch64 and AArch32.\r
@@ -37,4 +37,4 @@ ArmCallHvc (
   IN OUT ARM_HVC_ARGS *Args\r
   );\r
 \r
-#endif\r
+#endif // ARM_HVC_LIB_H_\r

diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index 70b9d816b74c0ae47fc5ffa5cfb64d599fd7ac78..5c232d779c833e54a5dac5d51e9e5cb49e85f250 100644 (file)
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -8,8 +8,8 @@
 \r
 **/\r
 \r
-#ifndef __ARM_LIB__\r
-#define __ARM_LIB__\r
+#ifndef ARM_LIB_H_\r
+#define ARM_LIB_H_\r
 \r
 #include <Uefi/UefiBaseType.h>\r
 \r
@@ -753,4 +753,4 @@ ArmHasSecurityExtensions (
   );\r
 #endif // MDE_CPU_ARM\r
 \r
-#endif // __ARM_LIB__\r
+#endif // ARM_LIB_H_\r

diff --git a/ArmPkg/Include/Library/ArmMmuLib.h b/ArmPkg/Include/Library/ArmMmuLib.h
index 23e89a0c65844b7dd6335b7db7ec1f4c0bf76c72..410f06ce373cc8224a4f22e38aa3e3cb7087b628 100644 (file)
--- a/ArmPkg/Include/Library/ArmMmuLib.h
+++ b/ArmPkg/Include/Library/ArmMmuLib.h
@@ -6,8 +6,8 @@
 \r
 **/\r
 \r
-#ifndef __ARM_MMU_LIB__\r
-#define __ARM_MMU_LIB__\r
+#ifndef ARM_MMU_LIB_H_\r
+#define ARM_MMU_LIB_H_\r
 \r
 #include <Uefi/UefiBaseType.h>\r
 \r
@@ -64,4 +64,4 @@ ArmSetMemoryAttributes (
   IN UINT64                    Attributes\r
   );\r
 \r
-#endif\r
+#endif // ARM_MMU_LIB_H_\r

diff --git a/ArmPkg/Include/Library/ArmSmcLib.h b/ArmPkg/Include/Library/ArmSmcLib.h
index 835d6788e0b9c518a6344baf296536857608a3f2..ced60b3c1147485e95df5bcc6580df8198d7c3f9 100644 (file)
--- a/ArmPkg/Include/Library/ArmSmcLib.h
+++ b/ArmPkg/Include/Library/ArmSmcLib.h
@@ -6,8 +6,8 @@
 *\r
 **/\r
 \r
-#ifndef __ARM_SMC_LIB__\r
-#define __ARM_SMC_LIB__\r
+#ifndef ARM_SMC_LIB_H_\r
+#define ARM_SMC_LIB_H_\r
 \r
 /**\r
  * The size of the SMC arguments are different between AArch64 and AArch32.\r
@@ -37,4 +37,4 @@ ArmCallSmc (
   IN OUT ARM_SMC_ARGS *Args\r
   );\r
 \r
-#endif\r
+#endif // ARM_SMC_LIB_H_\r

diff --git a/ArmPkg/Include/Library/ArmSvcLib.h b/ArmPkg/Include/Library/ArmSvcLib.h
index a4414270f3b93e0fce416c5f3faef8d1d29a6029..d4a1a8f118630693bffb1d44d92fe11faceba762 100644 (file)
--- a/ArmPkg/Include/Library/ArmSvcLib.h
+++ b/ArmPkg/Include/Library/ArmSvcLib.h
@@ -6,8 +6,8 @@
 *\r
 **/\r
 \r
-#ifndef __ARM_SVC_LIB__\r
-#define __ARM_SVC_LIB__\r
+#ifndef ARM_SVC_LIB_H_\r
+#define ARM_SVC_LIB_H_\r
 \r
 /**\r
  * The size of the SVC arguments are different between AArch64 and AArch32.\r
@@ -43,4 +43,4 @@ ArmCallSvc (
   IN OUT ARM_SVC_ARGS *Args\r
   );\r
 \r
-#endif\r
+#endif // ARM_SVC_LIB_H_\r

diff --git a/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h b/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h
index bbcf30f85752b444f9f82bc010dd5f50f0701576..57dc555e1332ade875f946cb0d9f37a8605ec3c4 100644 (file)
--- a/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h
+++ b/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h
@@ -6,8 +6,8 @@
 \r
 **/\r
 \r
-#ifndef __DEFAULT_EXCEPTION_HANDLER_LIB_H__\r
-#define __DEFAULT_EXCEPTION_HANDLER_LIB_H__\r
+#ifndef DEFAULT_EXCEPTION_HANDLER_LIB_H_\r
+#define DEFAULT_EXCEPTION_HANDLER_LIB_H_\r
 \r
 /**\r
   This is the default action to take on an unexpected exception\r
@@ -22,4 +22,4 @@ DefaultExceptionHandler (
   IN OUT EFI_SYSTEM_CONTEXT           SystemContext\r
   );\r
 \r
-#endif\r
+#endif // DEFAULT_EXCEPTION_HANDLER_LIB_H_\r

diff --git a/ArmPkg/Include/Library/OpteeLib.h b/ArmPkg/Include/Library/OpteeLib.h
index 8ceab117d1328b316ed589d60b0bf765a7ca8146..b9399d2e1810fd4c7d8f24cfda755c683bfead07 100644 (file)
--- a/ArmPkg/Include/Library/OpteeLib.h
+++ b/ArmPkg/Include/Library/OpteeLib.h
@@ -8,8 +8,8 @@
 \r
 **/\r
 \r
-#ifndef _OPTEE_H_\r
-#define _OPTEE_H_\r
+#ifndef OPTEE_LIB_H_\r
+#define OPTEE_LIB_H_\r
 \r
 /*\r
  * The 'Trusted OS Call UID' is supposed to return the following UUID for\r
@@ -117,4 +117,4 @@ OpteeInvokeFunction (
   IN OUT OPTEE_INVOKE_FUNCTION_ARG       *InvokeFunctionArg\r
   );\r
 \r
-#endif\r
+#endif // OPTEE_LIB_H_\r

diff --git a/ArmPkg/Include/Library/SemihostLib.h b/ArmPkg/Include/Library/SemihostLib.h
index ce08b2778d721975ccba88429b2d462abd84ae80..590728c804f415fc7a5a04ef0e882dc37b904361 100644 (file)
--- a/ArmPkg/Include/Library/SemihostLib.h
+++ b/ArmPkg/Include/Library/SemihostLib.h
@@ -7,8 +7,8 @@
 \r
 **/\r
 \r
-#ifndef __SEMIHOSTING_H__\r
-#define __SEMIHOSTING_H__\r
+#ifndef SEMIHOSTING_LIB_H_\r
+#define SEMIHOSTING_LIB_H_\r
 \r
 /*\r
  *\r
@@ -129,4 +129,4 @@ SemihostSystem (
   IN CHAR8 *CommandLine\r
   );\r
 \r
-#endif // __SEMIHOSTING_H__\r
+#endif // SEMIHOSTING_LIB_H_\r

diff --git a/ArmPkg/Include/Library/StandaloneMmMmuLib.h b/ArmPkg/Include/Library/StandaloneMmMmuLib.h
index 1d2a0e0c2bac1a9d5469997c6da055bb67ebda0d..ccc016d0350a2a90211f196907df2a7f1dcbf07d 100644 (file)
--- a/ArmPkg/Include/Library/StandaloneMmMmuLib.h
+++ b/ArmPkg/Include/Library/StandaloneMmMmuLib.h
@@ -6,8 +6,8 @@
 \r
 **/\r
 \r
-#ifndef __STANDALONEMM_MMU_LIB__\r
-#define __STANDALONEMM_MMU_LIB__\r
+#ifndef STANDALONE_MM_MMU_LIB_\r
+#define STANDALONE_MM_MMU_LIB_\r
 \r
 EFI_STATUS\r
 ArmSetMemoryRegionNoExec (\r
@@ -33,4 +33,4 @@ ArmClearMemoryRegionReadOnly (
   IN  UINT64                    Length\r
   );\r
 \r
-#endif /* __STANDALONEMM_MMU_LIB__ */\r
+#endif /* STANDALONE_MM_MMU_LIB_ */\r

diff --git a/ArmPkg/Include/Ppi/ArmMpCoreInfo.h b/ArmPkg/Include/Ppi/ArmMpCoreInfo.h
index 871119bde2f0bcda17c1055748f6403c2fb22d4b..b1e404ce13640cab4c547277c1126e85ca36b59c 100644 (file)
--- a/ArmPkg/Include/Ppi/ArmMpCoreInfo.h
+++ b/ArmPkg/Include/Ppi/ArmMpCoreInfo.h
@@ -6,8 +6,8 @@
 *\r
 **/\r
 \r
-#ifndef __ARM_MP_CORE_INFO_PPI_H__\r
-#define __ARM_MP_CORE_INFO_PPI_H__\r
+#ifndef ARM_MP_CORE_INFO_PPI_H_\r
+#define ARM_MP_CORE_INFO_PPI_H_\r
 \r
 #include <Guid/ArmMpCoreInfo.h>\r
 \r
@@ -49,4 +49,4 @@ typedef struct {
 extern EFI_GUID gArmMpCoreInfoPpiGuid;\r
 extern EFI_GUID gArmMpCoreInfoGuid;\r
 \r
-#endif\r
+#endif // ARM_MP_CORE_INFO_PPI_H_\r

diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h
index cfc0c878a4152145c9b3f73c1e14dab4db93b28e..318020277b24b1e2078784801d6249356820d1ac 100644 (file)
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h
@@ -8,8 +8,8 @@
 \r
 **/\r
 \r
-#ifndef __AARCH64_LIB_H__\r
-#define __AARCH64_LIB_H__\r
+#ifndef AARCH64_LIB_H_\r
+#define AARCH64_LIB_H_\r
 \r
 typedef VOID (*AARCH64_CACHE_OPERATION)(UINTN);\r
 \r
@@ -52,5 +52,5 @@ ArmReadIdAA64Mmfr2 (
   VOID\r
   );\r
 \r
-#endif // __AARCH64_LIB_H__\r
+#endif // AARCH64_LIB_H_\r
 \r

diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h
index dcf6723b803b4985955b80ecf6d7d73257dfb766..5a92ade2b3130e074394382aa32d260d15ce90d2 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h
+++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h
@@ -6,8 +6,8 @@
 \r
 **/\r
 \r
-#ifndef __ARM_V7_LIB_H__\r
-#define __ARM_V7_LIB_H__\r
+#ifndef ARM_V7_LIB_H_\r
+#define ARM_V7_LIB_H_\r
 \r
 #define ID_MMFR0_SHARELVL_SHIFT       12\r
 #define ID_MMFR0_SHARELVL_MASK       0xf\r
@@ -64,5 +64,5 @@ ArmReadIdPfr1 (
   VOID\r
   );\r
 \r
-#endif // __ARM_V7_LIB_H__\r
+#endif // ARM_V7_LIB_H_\r
 \r

diff --git a/ArmPkg/Library/ArmLib/ArmLibPrivate.h b/ArmPkg/Library/ArmLib/ArmLibPrivate.h
index 1818a1994dc328f0bcc14321a89db726e11a3f12..5db83d620bfce8bf4b6b7834a84ad43014a7fd59 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmLibPrivate.h
+++ b/ArmPkg/Library/ArmLib/ArmLibPrivate.h
@@ -8,8 +8,8 @@
 \r
 **/\r
 \r
-#ifndef __ARM_LIB_PRIVATE_H__\r
-#define __ARM_LIB_PRIVATE_H__\r
+#ifndef ARM_LIB_PRIVATE_H_\r
+#define ARM_LIB_PRIVATE_H_\r
 \r
 #define CACHE_SIZE_4_KB             (3UL)\r
 #define CACHE_SIZE_8_KB             (4UL)\r
@@ -186,4 +186,4 @@ ReadCLIDR (
   VOID\r
   );\r
 \r
-#endif // __ARM_LIB_PRIVATE_H__\r
+#endif // ARM_LIB_PRIVATE_H_\r

diff --git a/ArmPkg/Library/OpteeLib/OpteeSmc.h b/ArmPkg/Library/OpteeLib/OpteeSmc.h
index 62319d718dc5abe1b30aa22ea76f03a17d6e1823..b760ec8f8227eb3e4eb2cb62adc9797812f95769 100644 (file)
--- a/ArmPkg/Library/OpteeLib/OpteeSmc.h
+++ b/ArmPkg/Library/OpteeLib/OpteeSmc.h
@@ -7,8 +7,8 @@
 \r
 **/\r
 \r
-#ifndef _OPTEE_SMC_H_\r
-#define _OPTEE_SMC_H_\r
+#ifndef OPTEE_SMC_H_\r
+#define OPTEE_SMC_H_\r
 \r
 /* Returned in Arg0 only from Trusted OS functions */\r
 #define OPTEE_SMC_RETURN_OK                     0x0\r
@@ -47,4 +47,4 @@ typedef struct {
   UINT8   Data4[8];\r
 } RFC4122_UUID;\r
 \r
-#endif\r
+#endif // OPTEE_SMC_H_\r

diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.h b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.h
index 0bb3645ddc470d3bed6093d2d8cf2b1877541cf3..a40a2ff5cb4f421393e9ffae5f88e2c6acae8fe3 100644 (file)
--- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.h
+++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.h
@@ -9,8 +9,8 @@
 \r
 **/\r
 \r
-#ifndef _PLATFORM_BM_H_\r
-#define _PLATFORM_BM_H_\r
+#ifndef PLATFORM_BM_H_\r
+#define PLATFORM_BM_H_\r
 \r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
@@ -50,4 +50,4 @@ DisableQuietBoot (
   VOID\r
   );\r
 \r
-#endif // _PLATFORM_BM_H_\r
+#endif // PLATFORM_BM_H_\r

diff --git a/ArmPkg/Library/SemihostLib/SemihostPrivate.h b/ArmPkg/Library/SemihostLib/SemihostPrivate.h
index 30103b04b53f0234288afa385c0befe0e26e3bde..886472611623476ac4564b77fe3b105e30f96714 100644 (file)
--- a/ArmPkg/Library/SemihostLib/SemihostPrivate.h
+++ b/ArmPkg/Library/SemihostLib/SemihostPrivate.h
@@ -7,8 +7,8 @@
 \r
 **/\r
 \r
-#ifndef __SEMIHOST_PRIVATE_H__\r
-#define __SEMIHOST_PRIVATE_H__\r
+#ifndef SEMIHOST_PRIVATE_H_\r
+#define SEMIHOST_PRIVATE_H_\r
 \r
 typedef struct {\r
   CHAR8   *FileName;\r
@@ -209,4 +209,4 @@ GccSemihostCall (
 \r
 #endif // __CC_ARM\r
 \r
-#endif //__SEMIHOST_PRIVATE_H__\r
+#endif // SEMIHOST_PRIVATE_H_\r