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>

12 files changed, 36 insertions, 36 deletions

diff --git a/ArmPkg/Include/Library/ArmDisassemblerLib.h b/ArmPkg/Include/Library/ArmDisassemblerLib.h
index c103b72e81..d8c7af029d 100644
--- a/ArmPkg/Include/Library/ArmDisassemblerLib.h
+++ b/ArmPkg/Include/Library/ArmDisassemblerLib.h
@@ -6,8 +6,8 @@
 

 **/

 

-#ifndef __ARM_DISASSEBLER_LIB_H__

-#define __ARM_DISASSEBLER_LIB_H__

+#ifndef ARM_DISASSEMBLER_LIB_H_

+#define ARM_DISASSEMBLER_LIB_H_

 

 /**

   Place a disassembly of **OpCodePtr into buffer, and update OpCodePtr to

@@ -34,4 +34,4 @@ DisassembleInstruction (
   OUT UINTN     Size

   );

 

-#endif

+#endif // ARM_DISASSEMBLER_LIB_H_

diff --git a/ArmPkg/Include/Library/ArmGenericTimerCounterLib.h b/ArmPkg/Include/Library/ArmGenericTimerCounterLib.h
index d3051be30f..96bdffbf1e 100644
--- a/ArmPkg/Include/Library/ArmGenericTimerCounterLib.h
+++ b/ArmPkg/Include/Library/ArmGenericTimerCounterLib.h
@@ -7,8 +7,8 @@
 

 **/

 

-#ifndef __ARM_GENERIC_TIMER_COUNTER_LIB_H__

-#define __ARM_GENERIC_TIMER_COUNTER_LIB_H__

+#ifndef ARM_GENERIC_TIMER_COUNTER_LIB_H_

+#define ARM_GENERIC_TIMER_COUNTER_LIB_H_

 

 VOID

 EFIAPI

@@ -82,4 +82,4 @@ ArmGenericTimerSetCompareVal (
   IN   UINT64   Value

   );

 

-#endif

+#endif // ARM_GENERIC_TIMER_COUNTER_LIB_H_

diff --git a/ArmPkg/Include/Library/ArmGicArchLib.h b/ArmPkg/Include/Library/ArmGicArchLib.h
index 264322f1d0..b3635d2268 100644
--- a/ArmPkg/Include/Library/ArmGicArchLib.h
+++ b/ArmPkg/Include/Library/ArmGicArchLib.h
@@ -6,8 +6,8 @@
 *

 **/

 

-#ifndef __ARM_GIC_ARCH_LIB_H__

-#define __ARM_GIC_ARCH_LIB_H__

+#ifndef ARM_GIC_ARCH_LIB_H_

+#define ARM_GIC_ARCH_LIB_H_

 

 //

 // GIC definitions

@@ -24,4 +24,4 @@ ArmGicGetSupportedArchRevision (
   VOID

   );

 

-#endif

+#endif // ARM_GIC_ARCH_LIB_H_

diff --git a/ArmPkg/Include/Library/ArmHvcLib.h b/ArmPkg/Include/Library/ArmHvcLib.h
index d26f0cff31..d202c2af6e 100644
--- a/ArmPkg/Include/Library/ArmHvcLib.h
+++ b/ArmPkg/Include/Library/ArmHvcLib.h
@@ -6,8 +6,8 @@
 *

 **/

 

-#ifndef __ARM_HVC_LIB__

-#define __ARM_HVC_LIB__

+#ifndef ARM_HVC_LIB_H_

+#define ARM_HVC_LIB_H_

 

 /**

  * The size of the HVC arguments are different between AArch64 and AArch32.

@@ -37,4 +37,4 @@ ArmCallHvc (
   IN OUT ARM_HVC_ARGS *Args

   );

 

-#endif

+#endif // ARM_HVC_LIB_H_

diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index 70b9d816b7..5c232d779c 100644
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -8,8 +8,8 @@
 

 **/

 

-#ifndef __ARM_LIB__

-#define __ARM_LIB__

+#ifndef ARM_LIB_H_

+#define ARM_LIB_H_

 

 #include <Uefi/UefiBaseType.h>

 

@@ -753,4 +753,4 @@ ArmHasSecurityExtensions (
   );

 #endif // MDE_CPU_ARM

 

-#endif // __ARM_LIB__

+#endif // ARM_LIB_H_

diff --git a/ArmPkg/Include/Library/ArmMmuLib.h b/ArmPkg/Include/Library/ArmMmuLib.h
index 23e89a0c65..410f06ce37 100644
--- a/ArmPkg/Include/Library/ArmMmuLib.h
+++ b/ArmPkg/Include/Library/ArmMmuLib.h
@@ -6,8 +6,8 @@
 

 **/

 

-#ifndef __ARM_MMU_LIB__

-#define __ARM_MMU_LIB__

+#ifndef ARM_MMU_LIB_H_

+#define ARM_MMU_LIB_H_

 

 #include <Uefi/UefiBaseType.h>

 

@@ -64,4 +64,4 @@ ArmSetMemoryAttributes (
   IN UINT64                    Attributes

   );

 

-#endif

+#endif // ARM_MMU_LIB_H_

diff --git a/ArmPkg/Include/Library/ArmSmcLib.h b/ArmPkg/Include/Library/ArmSmcLib.h
index 835d6788e0..ced60b3c11 100644
--- a/ArmPkg/Include/Library/ArmSmcLib.h
+++ b/ArmPkg/Include/Library/ArmSmcLib.h
@@ -6,8 +6,8 @@
 *

 **/

 

-#ifndef __ARM_SMC_LIB__

-#define __ARM_SMC_LIB__

+#ifndef ARM_SMC_LIB_H_

+#define ARM_SMC_LIB_H_

 

 /**

  * The size of the SMC arguments are different between AArch64 and AArch32.

@@ -37,4 +37,4 @@ ArmCallSmc (
   IN OUT ARM_SMC_ARGS *Args

   );

 

-#endif

+#endif // ARM_SMC_LIB_H_

diff --git a/ArmPkg/Include/Library/ArmSvcLib.h b/ArmPkg/Include/Library/ArmSvcLib.h
index a4414270f3..d4a1a8f118 100644
--- a/ArmPkg/Include/Library/ArmSvcLib.h
+++ b/ArmPkg/Include/Library/ArmSvcLib.h
@@ -6,8 +6,8 @@
 *

 **/

 

-#ifndef __ARM_SVC_LIB__

-#define __ARM_SVC_LIB__

+#ifndef ARM_SVC_LIB_H_

+#define ARM_SVC_LIB_H_

 

 /**

  * The size of the SVC arguments are different between AArch64 and AArch32.

@@ -43,4 +43,4 @@ ArmCallSvc (
   IN OUT ARM_SVC_ARGS *Args

   );

 

-#endif

+#endif // ARM_SVC_LIB_H_

diff --git a/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h b/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h
index bbcf30f857..57dc555e13 100644
--- a/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h
+++ b/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h
@@ -6,8 +6,8 @@
 

 **/

 

-#ifndef __DEFAULT_EXCEPTION_HANDLER_LIB_H__

-#define __DEFAULT_EXCEPTION_HANDLER_LIB_H__

+#ifndef DEFAULT_EXCEPTION_HANDLER_LIB_H_

+#define DEFAULT_EXCEPTION_HANDLER_LIB_H_

 

 /**

   This is the default action to take on an unexpected exception

@@ -22,4 +22,4 @@ DefaultExceptionHandler (
   IN OUT EFI_SYSTEM_CONTEXT           SystemContext

   );

 

-#endif

+#endif // DEFAULT_EXCEPTION_HANDLER_LIB_H_

diff --git a/ArmPkg/Include/Library/OpteeLib.h b/ArmPkg/Include/Library/OpteeLib.h
index 8ceab117d1..b9399d2e18 100644
--- a/ArmPkg/Include/Library/OpteeLib.h
+++ b/ArmPkg/Include/Library/OpteeLib.h
@@ -8,8 +8,8 @@
 

 **/

 

-#ifndef _OPTEE_H_

-#define _OPTEE_H_

+#ifndef OPTEE_LIB_H_

+#define OPTEE_LIB_H_

 

 /*

  * The 'Trusted OS Call UID' is supposed to return the following UUID for

@@ -117,4 +117,4 @@ OpteeInvokeFunction (
   IN OUT OPTEE_INVOKE_FUNCTION_ARG       *InvokeFunctionArg

   );

 

-#endif

+#endif // OPTEE_LIB_H_

diff --git a/ArmPkg/Include/Library/SemihostLib.h b/ArmPkg/Include/Library/SemihostLib.h
index ce08b2778d..590728c804 100644
--- a/ArmPkg/Include/Library/SemihostLib.h
+++ b/ArmPkg/Include/Library/SemihostLib.h
@@ -7,8 +7,8 @@
 

 **/

 

-#ifndef __SEMIHOSTING_H__

-#define __SEMIHOSTING_H__

+#ifndef SEMIHOSTING_LIB_H_

+#define SEMIHOSTING_LIB_H_

 

 /*

  *

@@ -129,4 +129,4 @@ SemihostSystem (
   IN CHAR8 *CommandLine

   );

 

-#endif // __SEMIHOSTING_H__

+#endif // SEMIHOSTING_LIB_H_

diff --git a/ArmPkg/Include/Library/StandaloneMmMmuLib.h b/ArmPkg/Include/Library/StandaloneMmMmuLib.h
index 1d2a0e0c2b..ccc016d035 100644
--- a/ArmPkg/Include/Library/StandaloneMmMmuLib.h
+++ b/ArmPkg/Include/Library/StandaloneMmMmuLib.h
@@ -6,8 +6,8 @@
 

 **/

 

-#ifndef __STANDALONEMM_MMU_LIB__

-#define __STANDALONEMM_MMU_LIB__

+#ifndef STANDALONE_MM_MMU_LIB_

+#define STANDALONE_MM_MMU_LIB_

 

 EFI_STATUS

 ArmSetMemoryRegionNoExec (

@@ -33,4 +33,4 @@ ArmClearMemoryRegionReadOnly (
   IN  UINT64                    Length

   );

 

-#endif /* __STANDALONEMM_MMU_LIB__ */

+#endif /* STANDALONE_MM_MMU_LIB_ */