Arm Packages: Fixed coding style/Line endings to follow EDK2 coding convention

Arm Packages: Fixed mispelling

Arm Packages: Reduced warnings all over the code




git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12407 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 27 insertions, 211 deletions

diff --git a/ArmPkg/Include/Chipset/ArmV7.h b/ArmPkg/Include/Chipset/ArmV7.h
index e986ae7407..5fab7eddbe 100644
--- a/ArmPkg/Include/Chipset/ArmV7.h
+++ b/ArmPkg/Include/Chipset/ArmV7.h
@@ -15,6 +15,8 @@
 #ifndef __ARM_V7_H__

 #define __ARM_V7_H__

 

+#include <Chipset/ArmV7Mmu.h>

+

 // Domain Access Control Register

 #define DOMAIN_ACCESS_CONTROL_MASK(a)     (3UL << (2 * (a)))

 #define DOMAIN_ACCESS_CONTROL_NONE(a)     (0UL << (2 * (a)))

@@ -22,207 +24,6 @@
 #define DOMAIN_ACCESS_CONTROL_RESERVED(a) (2UL << (2 * (a)))

 #define DOMAIN_ACCESS_CONTROL_MANAGER(a)  (3UL << (2 * (a)))

 

-#define TTBR_NOT_OUTER_SHAREABLE             BIT5

-#define TTBR_RGN_OUTER_NON_CACHEABLE         0

-#define TTBR_RGN_OUTER_WRITE_BACK_ALLOC      BIT3

-#define TTBR_RGN_OUTER_WRITE_THROUGH         BIT4

-#define TTBR_RGN_OUTER_WRITE_BACK_NO_ALLOC   (BIT3|BIT4)

-#define TTBR_SHAREABLE                       BIT1

-#define TTBR_NON_SHAREABLE                   0

-#define TTBR_INNER_CACHEABLE                 BIT0

-#define TTBR_NON_INNER_CACHEABLE             BIT0

-#define TTBR_RGN_INNER_NON_CACHEABLE         0

-#define TTBR_RGN_INNER_WRITE_BACK_ALLOC      BIT6

-#define TTBR_RGN_INNER_WRITE_THROUGH         BIT0

-#define TTBR_RGN_INNER_WRITE_BACK_NO_ALLOC   (BIT0|BIT6)

-

-#define TTBR_WRITE_THROUGH_NO_ALLOC     ( TTBR_RGN_OUTER_WRITE_BACK_ALLOC | TTBR_RGN_INNER_WRITE_BACK_ALLOC )

-#define TTBR_WRITE_BACK_NO_ALLOC        ( TTBR_RGN_OUTER_WRITE_BACK_NO_ALLOC | TTBR_RGN_INNER_WRITE_BACK_NO_ALLOC )

-#define TTBR_NON_CACHEABLE              ( TTBR_RGN_OUTER_NON_CACHEABLE | TTBR_RGN_INNER_NON_CACHEABLE )

-#define TTBR_WRITE_BACK_ALLOC           ( TTBR_RGN_OUTER_WRITE_BACK_ALLOC | TTBR_RGN_INNER_WRITE_BACK_ALLOC )

-

-

-#define TRANSLATION_TABLE_SECTION_COUNT                 4096

-#define TRANSLATION_TABLE_SECTION_SIZE                  (sizeof(UINT32) * TRANSLATION_TABLE_SECTION_COUNT)

-#define TRANSLATION_TABLE_SECTION_ALIGNMENT             (sizeof(UINT32) * TRANSLATION_TABLE_SECTION_COUNT)

-#define TRANSLATION_TABLE_SECTION_ALIGNMENT_MASK        (TRANSLATION_TABLE_SECTION_ALIGNMENT - 1)

-

-#define TRANSLATION_TABLE_PAGE_COUNT                 256

-#define TRANSLATION_TABLE_PAGE_SIZE                  (sizeof(UINT32) * TRANSLATION_TABLE_PAGE_COUNT)

-#define TRANSLATION_TABLE_PAGE_ALIGNMENT             (sizeof(UINT32) * TRANSLATION_TABLE_PAGE_COUNT)

-#define TRANSLATION_TABLE_PAGE_ALIGNMENT_MASK        (TRANSLATION_TABLE_PAGE_ALIGNMENT - 1)

-

-#define TRANSLATION_TABLE_ENTRY_FOR_VIRTUAL_ADDRESS(table, address) ((UINT32 *)(table) + (((UINTN)(address)) >> 20))

-

-// Translation table descriptor types

-#define TT_DESCRIPTOR_SECTION_TYPE_MASK         ((1UL << 18) | (3UL << 0))

-#define TT_DESCRIPTOR_SECTION_TYPE_FAULT        (0UL << 0)

-#define TT_DESCRIPTOR_SECTION_TYPE_PAGE_TABLE   (1UL << 0)

-#define TT_DESCRIPTOR_SECTION_TYPE_SECTION      ((0UL << 18) | (2UL << 0))

-#define TT_DESCRIPTOR_SECTION_TYPE_SUPERSECTION ((1UL << 18) | (2UL << 0))

-#define TT_DESCRIPTOR_SECTION_TYPE_IS_PAGE_TABLE(Desc) (((Desc) & 3UL) == TT_DESCRIPTOR_SECTION_TYPE_PAGE_TABLE)

-

-// Translation table descriptor types

-#define TT_DESCRIPTOR_PAGE_TYPE_MASK         (3UL << 0)

-#define TT_DESCRIPTOR_PAGE_TYPE_FAULT        (0UL << 0)

-#define TT_DESCRIPTOR_PAGE_TYPE_PAGE         (2UL << 0)

-#define TT_DESCRIPTOR_PAGE_TYPE_PAGE_XN      (3UL << 0)

-#define TT_DESCRIPTOR_PAGE_TYPE_LARGEPAGE    (1UL << 0)

-

-// Section descriptor definitions

-#define TT_DESCRIPTOR_SECTION_SIZE                              (0x00100000)

-

-#define TT_DESCRIPTOR_SECTION_NS_MASK                           (1UL << 19)

-#define TT_DESCRIPTOR_SECTION_NS_SECURE                         (0UL << 19)

-#define TT_DESCRIPTOR_SECTION_NS_NON_SECURE                     (1UL << 19)

-

-#define TT_DESCRIPTOR_SECTION_NG_MASK                           (1UL << 17)

-#define TT_DESCRIPTOR_SECTION_NG_GLOBAL                         (0UL << 17)

-#define TT_DESCRIPTOR_SECTION_NG_LOCAL                          (1UL << 17)

-

-#define TT_DESCRIPTOR_PAGE_NG_MASK                              (1UL << 11)

-#define TT_DESCRIPTOR_PAGE_NG_GLOBAL                            (0UL << 11)

-#define TT_DESCRIPTOR_PAGE_NG_LOCAL                             (1UL << 11)

-

-#define TT_DESCRIPTOR_SECTION_S_MASK                            (1UL << 16)

-#define TT_DESCRIPTOR_SECTION_S_NOT_SHARED                      (0UL << 16)

-#define TT_DESCRIPTOR_SECTION_S_SHARED                          (1UL << 16)

-

-#define TT_DESCRIPTOR_PAGE_S_MASK                               (1UL << 10)

-#define TT_DESCRIPTOR_PAGE_S_NOT_SHARED                         (0UL << 10)

-#define TT_DESCRIPTOR_PAGE_S_SHARED                             (1UL << 10)

-

-#define TT_DESCRIPTOR_SECTION_AP_MASK                           ((1UL << 15) | (3UL << 10))

-#define TT_DESCRIPTOR_SECTION_AP_NO_NO                          ((0UL << 15) | (0UL << 10))

-#define TT_DESCRIPTOR_SECTION_AP_RW_NO                          ((0UL << 15) | (1UL << 10))

-#define TT_DESCRIPTOR_SECTION_AP_RW_RO                          ((0UL << 15) | (2UL << 10))

-#define TT_DESCRIPTOR_SECTION_AP_RW_RW                          ((0UL << 15) | (3UL << 10))

-#define TT_DESCRIPTOR_SECTION_AP_RO_NO                          ((1UL << 15) | (1UL << 10))

-#define TT_DESCRIPTOR_SECTION_AP_RO_RO                          ((1UL << 15) | (3UL << 10))

-

-#define TT_DESCRIPTOR_PAGE_AP_MASK                              ((1UL << 9) | (3UL << 4))

-#define TT_DESCRIPTOR_PAGE_AP_NO_NO                             ((0UL << 9) | (0UL << 4))

-#define TT_DESCRIPTOR_PAGE_AP_RW_NO                             ((0UL << 9) | (1UL << 4))

-#define TT_DESCRIPTOR_PAGE_AP_RW_RO                             ((0UL << 9) | (2UL << 4))

-#define TT_DESCRIPTOR_PAGE_AP_RW_RW                             ((0UL << 9) | (3UL << 4))

-#define TT_DESCRIPTOR_PAGE_AP_RO_NO                             ((1UL << 9) | (1UL << 4))

-#define TT_DESCRIPTOR_PAGE_AP_RO_RO                             ((1UL << 9) | (3UL << 4))

-

-#define TT_DESCRIPTOR_SECTION_XN_MASK                           (0x1UL << 4)

-#define TT_DESCRIPTOR_PAGE_XN_MASK                              (0x1UL << 0)

-#define TT_DESCRIPTOR_LARGEPAGE_XN_MASK                         (0x1UL << 15)

-

-#define TT_DESCRIPTOR_SECTION_CACHE_POLICY_MASK                   ((3UL << 12) | (1UL << 3) | (1UL << 2))

-#define TT_DESCRIPTOR_SECTION_CACHEABLE_MASK                      (1UL << 3)

-#define TT_DESCRIPTOR_SECTION_CACHE_POLICY_STRONGLY_ORDERED       ((0UL << 12) | (0UL << 3) | (0UL << 2))

-#define TT_DESCRIPTOR_SECTION_CACHE_POLICY_SHAREABLE_DEVICE       ((0UL << 12) | (0UL << 3) | (1UL << 2))

-#define TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_THROUGH_NO_ALLOC ((0UL << 12) | (1UL << 3) | (0UL << 2))

-#define TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_BACK_NO_ALLOC    ((0UL << 12) | (1UL << 3) | (1UL << 2))

-#define TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_CACHEABLE          ((1UL << 12) | (0UL << 3) | (0UL << 2))

-#define TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_BACK_ALLOC       ((1UL << 12) | (1UL << 3) | (1UL << 2))

-#define TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_SHAREABLE_DEVICE   ((2UL << 12) | (0UL << 3) | (0UL << 2))

-

-#define TT_DESCRIPTOR_PAGE_SIZE                               (0x00001000)

-

-#define TT_DESCRIPTOR_PAGE_CACHE_POLICY_MASK                   ((3UL << 6) | (1UL << 3) | (1UL << 2))

-#define TT_DESCRIPTOR_PAGE_CACHEABLE_MASK                       (1UL << 3)

-#define TT_DESCRIPTOR_PAGE_CACHE_POLICY_STRONGLY_ORDERED       ((0UL << 6) | (0UL << 3) | (0UL << 2))

-#define TT_DESCRIPTOR_PAGE_CACHE_POLICY_SHAREABLE_DEVICE       ((0UL << 6) | (0UL << 3) | (1UL << 2))

-#define TT_DESCRIPTOR_PAGE_CACHE_POLICY_WRITE_THROUGH_NO_ALLOC ((0UL << 6) | (1UL << 3) | (0UL << 2))

-#define TT_DESCRIPTOR_PAGE_CACHE_POLICY_WRITE_BACK_NO_ALLOC    ((0UL << 6) | (1UL << 3) | (1UL << 2))

-#define TT_DESCRIPTOR_PAGE_CACHE_POLICY_NON_CACHEABLE          ((1UL << 6) | (0UL << 3) | (0UL << 2))

-#define TT_DESCRIPTOR_PAGE_CACHE_POLICY_WRITE_BACK_ALLOC       ((1UL << 6) | (1UL << 3) | (1UL << 2))

-#define TT_DESCRIPTOR_PAGE_CACHE_POLICY_NON_SHAREABLE_DEVICE   ((2UL << 6) | (0UL << 3) | (0UL << 2))

-

-#define TT_DESCRIPTOR_LARGEPAGE_CACHE_POLICY_MASK                   ((3UL << 12) | (1UL << 3) | (1UL << 2))

-#define TT_DESCRIPTOR_LARGEPAGE_CACHE_POLICY_STRONGLY_ORDERED       ((0UL << 12) | (0UL << 3) | (0UL << 2))

-#define TT_DESCRIPTOR_LARGEPAGE_CACHE_POLICY_SHAREABLE_DEVICE       ((0UL << 12) | (0UL << 3) | (1UL << 2))

-#define TT_DESCRIPTOR_LARGEPAGE_CACHE_POLICY_WRITE_THROUGH_NO_ALLOC ((0UL << 12) | (1UL << 3) | (0UL << 2))

-#define TT_DESCRIPTOR_LARGEPAGE_CACHE_POLICY_WRITE_BACK_NO_ALLOC    ((0UL << 12) | (1UL << 3) | (1UL << 2))

-#define TT_DESCRIPTOR_LARGEPAGE_CACHE_POLICY_NON_CACHEABLE          ((1UL << 12) | (0UL << 3) | (0UL << 2))

-#define TT_DESCRIPTOR_LARGEPAGE_CACHE_POLICY_WRITE_BACK_ALLOC       ((1UL << 12) | (1UL << 3) | (1UL << 2))

-#define TT_DESCRIPTOR_LARGEPAGE_CACHE_POLICY_NON_SHAREABLE_DEVICE   ((2UL << 12) | (0UL << 3) | (0UL << 2))

-

-#define TT_DESCRIPTOR_CONVERT_TO_PAGE_AP(Desc)                  ((((Desc) & TT_DESCRIPTOR_SECTION_AP_MASK) >> 6) & TT_DESCRIPTOR_PAGE_AP_MASK)

-#define TT_DESCRIPTOR_CONVERT_TO_PAGE_NG(Desc)                  ((((Desc) & TT_DESCRIPTOR_SECTION_NG_MASK) >> 6) & TT_DESCRIPTOR_PAGE_NG_MASK)

-#define TT_DESCRIPTOR_CONVERT_TO_PAGE_S(Desc)                  ((((Desc) & TT_DESCRIPTOR_SECTION_S_MASK) >> 6) & TT_DESCRIPTOR_PAGE_S_MASK)

-#define TT_DESCRIPTOR_CONVERT_TO_PAGE_XN(Desc,IsLargePage)      ((IsLargePage)? \

-                                                                    ((((Desc) & TT_DESCRIPTOR_SECTION_XN_MASK) >> 4) & TT_DESCRIPTOR_LARGEPAGE_XN_MASK):    \

-                                                                    ((((Desc) & TT_DESCRIPTOR_SECTION_XN_MASK) << 11) & TT_DESCRIPTOR_PAGE_XN_MASK))

-#define TT_DESCRIPTOR_CONVERT_TO_PAGE_CACHE_POLICY(Desc,IsLargePage)      (IsLargePage? \

-                                                                    (((Desc) & TT_DESCRIPTOR_SECTION_CACHE_POLICY_MASK) & TT_DESCRIPTOR_LARGEPAGE_CACHE_POLICY_MASK): \

-                                                                    (((((Desc) & (0x3 << 12)) >> 6) | (Desc & (0x3 << 2)))))

-

-#define TT_DESCRIPTOR_CONVERT_TO_SECTION_AP(Desc)                  ((((Desc) & TT_DESCRIPTOR_PAGE_AP_MASK) << 6) & TT_DESCRIPTOR_SECTION_AP_MASK)

-

-#define TT_DESCRIPTOR_CONVERT_TO_SECTION_CACHE_POLICY(Desc,IsLargePage)      (IsLargePage? \

-                                                                    (((Desc) & TT_DESCRIPTOR_LARGEPAGE_CACHE_POLICY_MASK) & TT_DESCRIPTOR_SECTION_CACHE_POLICY_MASK): \

-                                                                    (((((Desc) & (0x3 << 6)) << 6) | (Desc & (0x3 << 2)))))

-

-

-#define TT_DESCRIPTOR_SECTION_DOMAIN_MASK                       (0x0FUL << 5)

-#define TT_DESCRIPTOR_SECTION_DOMAIN(a)                         (((a) & 0x0FUL) << 5)

-

-#define TT_DESCRIPTOR_SECTION_BASE_ADDRESS_MASK                 (0xFFF00000)

-#define TT_DESCRIPTOR_SECTION_PAGETABLE_ADDRESS_MASK            (0xFFFFFC00)

-#define TT_DESCRIPTOR_SECTION_BASE_ADDRESS(a)                   ((a) & TT_DESCRIPTOR_SECTION_BASE_ADDRESS_MASK)

-#define TT_DESCRIPTOR_SECTION_BASE_SHIFT                        20

-

-#define TT_DESCRIPTOR_PAGE_BASE_ADDRESS_MASK                 (0xFFFFF000)

-#define TT_DESCRIPTOR_PAGE_INDEX_MASK                        (0x000FF000)

-#define TT_DESCRIPTOR_PAGE_BASE_ADDRESS(a)                   ((a) & TT_DESCRIPTOR_PAGE_BASE_ADDRESS_MASK)

-#define TT_DESCRIPTOR_PAGE_BASE_SHIFT                        12

-

-#define TT_DESCRIPTOR_SECTION_WRITE_BACK(Secure)       (TT_DESCRIPTOR_SECTION_TYPE_SECTION                                                           | \

-                                                        ((Secure) ?  TT_DESCRIPTOR_SECTION_NS_SECURE : TT_DESCRIPTOR_SECTION_NS_NON_SECURE )    | \

-                                                                     TT_DESCRIPTOR_SECTION_NG_GLOBAL                         | \

-                                                                     TT_DESCRIPTOR_SECTION_S_NOT_SHARED                      | \

-                                                                     TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \

-                                                                     TT_DESCRIPTOR_SECTION_AP_RW_RW                          | \

-                                                                     TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_BACK_ALLOC)

-#define TT_DESCRIPTOR_SECTION_WRITE_THROUGH(Secure)    (TT_DESCRIPTOR_SECTION_TYPE_SECTION                                                           | \

-                                                        ((Secure) ?  TT_DESCRIPTOR_SECTION_NS_SECURE : TT_DESCRIPTOR_SECTION_NS_NON_SECURE )    | \

-                                                                     TT_DESCRIPTOR_SECTION_NG_GLOBAL                         | \

-                                                                     TT_DESCRIPTOR_SECTION_S_NOT_SHARED                      | \

-                                                                     TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \

-                                                                     TT_DESCRIPTOR_SECTION_AP_RW_RW                          | \

-                                                                     TT_DESCRIPTOR_SECTION_CACHE_POLICY_WRITE_THROUGH_NO_ALLOC)

-#define TT_DESCRIPTOR_SECTION_DEVICE(Secure)           (TT_DESCRIPTOR_SECTION_TYPE_SECTION                                                           | \

-                                                        ((Secure) ?  TT_DESCRIPTOR_SECTION_NS_SECURE : TT_DESCRIPTOR_SECTION_NS_NON_SECURE )    | \

-                                                                     TT_DESCRIPTOR_SECTION_NG_GLOBAL                         | \

-                                                                     TT_DESCRIPTOR_SECTION_S_NOT_SHARED                      | \

-                                                                     TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \

-                                                                     TT_DESCRIPTOR_SECTION_AP_RW_RW                          | \

-                                                                     TT_DESCRIPTOR_SECTION_CACHE_POLICY_SHAREABLE_DEVICE)

-#define TT_DESCRIPTOR_SECTION_UNCACHED(Secure)         (TT_DESCRIPTOR_SECTION_TYPE_SECTION                                                           | \

-                                                        ((Secure) ?  TT_DESCRIPTOR_SECTION_NS_SECURE : TT_DESCRIPTOR_SECTION_NS_NON_SECURE )    | \

-                                                                     TT_DESCRIPTOR_SECTION_NG_GLOBAL                         | \

-                                                                     TT_DESCRIPTOR_SECTION_S_NOT_SHARED                      | \

-                                                                     TT_DESCRIPTOR_SECTION_DOMAIN(0)                         | \

-                                                                     TT_DESCRIPTOR_SECTION_AP_RW_RW                          | \

-                                                                     TT_DESCRIPTOR_SECTION_CACHE_POLICY_NON_CACHEABLE)

-

-#define TT_DESCRIPTOR_PAGE_WRITE_BACK              (TT_DESCRIPTOR_PAGE_TYPE_PAGE                                                           | \

-                                                        TT_DESCRIPTOR_PAGE_NG_GLOBAL                                                      | \

-                                                        TT_DESCRIPTOR_PAGE_S_NOT_SHARED                                                   | \

-                                                        TT_DESCRIPTOR_PAGE_AP_RW_RW                                                       | \

-                                                        TT_DESCRIPTOR_PAGE_CACHE_POLICY_WRITE_BACK_ALLOC)

-#define TT_DESCRIPTOR_PAGE_WRITE_THROUGH           (TT_DESCRIPTOR_PAGE_TYPE_PAGE                                                           | \

-                                                        TT_DESCRIPTOR_PAGE_NG_GLOBAL                                                      | \

-                                                        TT_DESCRIPTOR_PAGE_S_NOT_SHARED                                                   | \

-                                                        TT_DESCRIPTOR_PAGE_AP_RW_RW                                                       | \

-                                                        TT_DESCRIPTOR_PAGE_CACHE_POLICY_WRITE_THROUGH_NO_ALLOC)

-#define TT_DESCRIPTOR_PAGE_DEVICE                  (TT_DESCRIPTOR_PAGE_TYPE_PAGE                                                           | \

-                                                        TT_DESCRIPTOR_PAGE_NG_GLOBAL                                                      | \

-                                                        TT_DESCRIPTOR_PAGE_S_NOT_SHARED                                                   | \

-                                                        TT_DESCRIPTOR_PAGE_AP_RW_RW                                                       | \

-                                                        TT_DESCRIPTOR_PAGE_CACHE_POLICY_SHAREABLE_DEVICE)

-#define TT_DESCRIPTOR_PAGE_UNCACHED                (TT_DESCRIPTOR_PAGE_TYPE_PAGE                                                           | \

-                                                        TT_DESCRIPTOR_PAGE_NG_GLOBAL                                                      | \

-                                                        TT_DESCRIPTOR_PAGE_S_NOT_SHARED                                                   | \

-                                                        TT_DESCRIPTOR_PAGE_AP_RW_RW                                                       | \

-                                                        TT_DESCRIPTOR_PAGE_CACHE_POLICY_NON_CACHEABLE)

-

 // Cortex A9 feature bit definitions

 #define A9_FEATURE_PARITY  (1<<9)

 #define A9_FEATURE_AOW     (1<<8)

@@ -245,7 +46,7 @@
 #define SMP_GIC_CPUIF_BASE       0x100

 #define SMP_GIC_DIST_BASE        0x1000

 

-// CPACR - Coprocessor Access Control Register defintions

+// CPACR - Coprocessor Access Control Register definitions

 #define CPACR_CP_DENIED(cp)     0x00

 #define CPACR_CP_PRIV(cp)       ((0x1 << ((cp) << 1)) & 0x0FFFFFFF)

 #define CPACR_CP_FULL(cp)       ((0x3 << ((cp) << 1)) & 0x0FFFFFFF)

@@ -253,7 +54,7 @@
 #define CPACR_D32DIS            (1 << 30)

 #define CPACR_CP_FULL_ACCESS    0x0FFFFFFF

 

-// NSACR - Non-Secure Access Control Register defintions

+// NSACR - Non-Secure Access Control Register definitions

 #define NSACR_CP(cp)            ((1 << (cp)) & 0x3FFF)

 #define NSACR_NSD32DIS          (1 << 14)

 #define NSACR_NSASEDIS          (1 << 15)

@@ -262,7 +63,7 @@
 #define NSACR_NS_SMP            (1 << 18)

 #define NSACR_RFR               (1 << 19)

 

-// SCR - Secure Configuration Register defintions

+// SCR - Secure Configuration Register definitions

 #define SCR_NS                  (1 << 0)

 #define SCR_IRQ                 (1 << 1)

 #define SCR_FIQ                 (1 << 2)

@@ -330,7 +131,6 @@ ArmInvalidScu (
   VOID

   );

 

-

 UINTN

 EFIAPI

 ArmGetScuBaseAddress (

@@ -367,7 +167,6 @@ ArmSetupSmpNonSecure (
   IN  UINTN                     CoreId

   );

 

-

 UINTN 

 EFIAPI

 ArmReadCbar (

@@ -387,14 +186,12 @@ ArmReadMpidr (
   VOID

   );

 

-

 UINTN

 EFIAPI

 ArmReadTpidrurw (

   VOID

   );

 

-

 VOID

 EFIAPI

 ArmWriteTpidrurw (

diff --git a/ArmPkg/Include/Library/ArmTrustZoneLib.h b/ArmPkg/Include/Library/ArmTrustZoneLib.h
index 8eeb6a2fee..bcc875495a 100644
--- a/ArmPkg/Include/Library/ArmTrustZoneLib.h
+++ b/ArmPkg/Include/Library/ArmTrustZoneLib.h
@@ -26,12 +26,22 @@
 /**

     FIXME: Need documentation

 **/

-EFI_STATUS TZPCSetDecProtBits(UINTN tzpc_base, UINTN tzpc_id, UINTN bits);

+EFI_STATUS

+TZPCSetDecProtBits (

+  IN  UINTN TzpcBase,

+  IN  UINTN TzpcId,

+  IN  UINTN Bits

+  );

 

 /**

     FIXME: Need documentation

 **/

-EFI_STATUS TZPCClearDecProtBits(UINTN tzpc_base, UINTN tzpc_id, UINTN bits);

+EFI_STATUS

+TZPCClearDecProtBits (

+  IN  UINTN TzpcBase,

+  IN  UINTN TzpcId,

+  IN  UINTN Bits

+  );

 

 // Setup TZ Address Space Controller

 #define TZASC_REGION_ENABLED        1

@@ -64,6 +74,15 @@ EFI_STATUS TZPCClearDecProtBits(UINTN tzpc_base, UINTN tzpc_id, UINTN bits);
 /**

     FIXME: Need documentation

 **/

-EFI_STATUS TZASCSetRegion(UINTN tzasc_base, UINTN region_id, UINTN enabled, UINTN low_address, UINTN high_address, UINTN size, UINTN security);

+EFI_STATUS

+TZASCSetRegion (

+  IN  INTN  TzascBase,

+  IN  UINTN RegionId,

+  IN  UINTN Enabled,

+  IN  UINTN LowAddress,

+  IN  UINTN HighAddress,

+  IN  UINTN Size,

+  IN  UINTN Security

+  );

 

 #endif