ArmPlatformPkg: Code cleaning

- Fix coding style to follow EDK2 coding convention
- Remove deprecated function
- Remove unused PCDs



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

3 files changed, 83 insertions, 76 deletions

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf
index 97b206d780..185c0ae406 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf
@@ -42,5 +42,3 @@
   gArmPlatformTokenSpaceGuid.PcdStandalone
 
 [FixedPcd]
-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress
-  gArmTokenSpaceGuid.PcdNormalFdSize
diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
index 95fd2bb484..616fa0ef8c 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c
@@ -18,6 +18,8 @@
 #include <Library/MemoryAllocationLib.h>

 #include <Library/IoLib.h>

 

+#define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS          6

+

 // DDR attributes

 #define DDR_ATTRIBUTES_CACHED           ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK

 #define DDR_ATTRIBUTES_UNCACHED         ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED

@@ -34,76 +36,84 @@
                                     entry

 

 **/

-VOID ArmPlatformGetVirtualMemoryMap(ARM_MEMORY_REGION_DESCRIPTOR** VirtualMemoryMap) {

-    UINT32                        CacheAttributes;

-    BOOLEAN                       bTrustzoneSupport = FALSE;

-    UINTN                         Index = 0;

-    ARM_MEMORY_REGION_DESCRIPTOR  *VirtualMemoryTable;

-

-    ASSERT(VirtualMemoryMap != NULL);

-

-    VirtualMemoryTable = (ARM_MEMORY_REGION_DESCRIPTOR*)AllocatePages(sizeof(ARM_MEMORY_REGION_DESCRIPTOR) * 9);

-    if (VirtualMemoryTable == NULL) {

-        return;

-    }

-

-    if (FeaturePcdGet(PcdCacheEnable) == TRUE) {

-        CacheAttributes = (bTrustzoneSupport ? DDR_ATTRIBUTES_CACHED : DDR_ATTRIBUTES_SECURE_CACHED);

-    } else {

-        CacheAttributes = (bTrustzoneSupport ? DDR_ATTRIBUTES_UNCACHED : DDR_ATTRIBUTES_SECURE_UNCACHED);

-    }

-

-    // ReMap (Either NOR Flash or DRAM)

-    VirtualMemoryTable[Index].PhysicalBase = ARM_EB_REMAP_BASE;

-    VirtualMemoryTable[Index].VirtualBase  = ARM_EB_REMAP_BASE;

-    VirtualMemoryTable[Index].Length       = ARM_EB_REMAP_SZ;

-    VirtualMemoryTable[Index].Attributes   = (ARM_MEMORY_REGION_ATTRIBUTES)CacheAttributes;

-

-    // DDR

-    VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_DRAM_BASE;

-    VirtualMemoryTable[Index].VirtualBase  = ARM_EB_DRAM_BASE;

-    VirtualMemoryTable[Index].Length       = ARM_EB_DRAM_SZ;

-    VirtualMemoryTable[Index].Attributes   = (ARM_MEMORY_REGION_ATTRIBUTES)CacheAttributes;

-

-    // SMC CS7

-    VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_SMB_MB_ON_CHIP_PERIPH_BASE;

-    VirtualMemoryTable[Index].VirtualBase  = ARM_EB_SMB_MB_ON_CHIP_PERIPH_BASE;

-    VirtualMemoryTable[Index].Length       = ARM_EB_SMB_MB_ON_CHIP_PERIPH_SZ;

-    VirtualMemoryTable[Index].Attributes   = (bTrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);

-

-    // SMB CS0-CS1 - NOR Flash 1 & 2

-    VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_SMB_NOR_BASE;

-    VirtualMemoryTable[Index].VirtualBase  = ARM_EB_SMB_NOR_BASE;

-    VirtualMemoryTable[Index].Length       = ARM_EB_SMB_NOR_SZ + ARM_EB_SMB_DOC_SZ;

-    VirtualMemoryTable[Index].Attributes   = (bTrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);

-

-    // SMB CS2 - SRAM

-    VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_SMB_SRAM_BASE;

-    VirtualMemoryTable[Index].VirtualBase  = ARM_EB_SMB_SRAM_BASE;

-    VirtualMemoryTable[Index].Length       = ARM_EB_SMB_SRAM_SZ;

-    VirtualMemoryTable[Index].Attributes   = (ARM_MEMORY_REGION_ATTRIBUTES)CacheAttributes;

-

-    // SMB CS3-CS6 - Motherboard Peripherals

-    VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_SMB_PERIPH_BASE;

-    VirtualMemoryTable[Index].VirtualBase  = ARM_EB_SMB_PERIPH_BASE;

-    VirtualMemoryTable[Index].Length       = ARM_EB_SMB_PERIPH_SZ;

-    VirtualMemoryTable[Index].Attributes   = (bTrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);

-

-    // If a Logic Tile is connected to The ARM Versatile Express Motherboard

-    if (MmioRead32(ARM_EB_SYS_PROCID1_REG) != 0) {

-        VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_LOGIC_TILE_BASE;

-        VirtualMemoryTable[Index].VirtualBase  = ARM_EB_LOGIC_TILE_BASE;

-        VirtualMemoryTable[Index].Length       = ARM_EB_LOGIC_TILE_SZ;

-        VirtualMemoryTable[Index].Attributes   = (bTrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);

-    }

-

-    // End of Table

-    VirtualMemoryTable[++Index].PhysicalBase = 0;

-    VirtualMemoryTable[Index].VirtualBase  = 0;

-    VirtualMemoryTable[Index].Length       = 0;

-    VirtualMemoryTable[Index].Attributes   = (ARM_MEMORY_REGION_ATTRIBUTES)0;

-

-    *VirtualMemoryMap = VirtualMemoryTable;

+VOID

+ArmPlatformGetVirtualMemoryMap (

+  IN ARM_MEMORY_REGION_DESCRIPTOR** VirtualMemoryMap

+  )

+{

+  UINT32                        CacheAttributes;

+  BOOLEAN                       bTrustzoneSupport = FALSE;

+  UINTN                         Index = 0;

+  ARM_MEMORY_REGION_DESCRIPTOR  *VirtualMemoryTable;

+

+  ASSERT(VirtualMemoryMap != NULL);

+

+  VirtualMemoryTable = (ARM_MEMORY_REGION_DESCRIPTOR*)AllocatePages(EFI_SIZE_TO_PAGES (sizeof(ARM_MEMORY_REGION_DESCRIPTOR) * MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS));

+  if (VirtualMemoryTable == NULL) {

+      return;

+  }

+

+  if (FeaturePcdGet(PcdCacheEnable) == TRUE) {

+    CacheAttributes = (bTrustzoneSupport ? DDR_ATTRIBUTES_CACHED : DDR_ATTRIBUTES_SECURE_CACHED);

+  } else {

+    CacheAttributes = (bTrustzoneSupport ? DDR_ATTRIBUTES_UNCACHED : DDR_ATTRIBUTES_SECURE_UNCACHED);

+  }

+

+  // ReMap (Either NOR Flash or DRAM)

+  VirtualMemoryTable[Index].PhysicalBase = ARM_EB_REMAP_BASE;

+  VirtualMemoryTable[Index].VirtualBase  = ARM_EB_REMAP_BASE;

+  VirtualMemoryTable[Index].Length       = ARM_EB_REMAP_SZ;

+  VirtualMemoryTable[Index].Attributes   = (ARM_MEMORY_REGION_ATTRIBUTES)CacheAttributes;

+

+  // DDR

+  VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_DRAM_BASE;

+  VirtualMemoryTable[Index].VirtualBase  = ARM_EB_DRAM_BASE;

+  VirtualMemoryTable[Index].Length       = ARM_EB_DRAM_SZ;

+  VirtualMemoryTable[Index].Attributes   = (ARM_MEMORY_REGION_ATTRIBUTES)CacheAttributes;

+

+  // SMC CS7

+  VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_SMB_MB_ON_CHIP_PERIPH_BASE;

+  VirtualMemoryTable[Index].VirtualBase  = ARM_EB_SMB_MB_ON_CHIP_PERIPH_BASE;

+  VirtualMemoryTable[Index].Length       = ARM_EB_SMB_MB_ON_CHIP_PERIPH_SZ;

+  VirtualMemoryTable[Index].Attributes   = (bTrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);

+

+  // SMB CS0-CS1 - NOR Flash 1 & 2

+  VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_SMB_NOR_BASE;

+  VirtualMemoryTable[Index].VirtualBase  = ARM_EB_SMB_NOR_BASE;

+  VirtualMemoryTable[Index].Length       = ARM_EB_SMB_NOR_SZ + ARM_EB_SMB_DOC_SZ;

+  VirtualMemoryTable[Index].Attributes   = (bTrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);

+

+  // SMB CS2 - SRAM

+  VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_SMB_SRAM_BASE;

+  VirtualMemoryTable[Index].VirtualBase  = ARM_EB_SMB_SRAM_BASE;

+  VirtualMemoryTable[Index].Length       = ARM_EB_SMB_SRAM_SZ;

+  VirtualMemoryTable[Index].Attributes   = (ARM_MEMORY_REGION_ATTRIBUTES)CacheAttributes;

+

+  // SMB CS3-CS6 - Motherboard Peripherals

+  VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_SMB_PERIPH_BASE;

+  VirtualMemoryTable[Index].VirtualBase  = ARM_EB_SMB_PERIPH_BASE;

+  VirtualMemoryTable[Index].Length       = ARM_EB_SMB_PERIPH_SZ;

+  VirtualMemoryTable[Index].Attributes   = (bTrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);

+

+  // If a Logic Tile is connected to The ARM Versatile Express Motherboard

+  if (MmioRead32(ARM_EB_SYS_PROCID1_REG) != 0) {

+      VirtualMemoryTable[++Index].PhysicalBase = ARM_EB_LOGIC_TILE_BASE;

+      VirtualMemoryTable[Index].VirtualBase  = ARM_EB_LOGIC_TILE_BASE;

+      VirtualMemoryTable[Index].Length       = ARM_EB_LOGIC_TILE_SZ;

+      VirtualMemoryTable[Index].Attributes   = (bTrustzoneSupport ? ARM_MEMORY_REGION_ATTRIBUTE_DEVICE : ARM_MEMORY_REGION_ATTRIBUTE_SECURE_DEVICE);

+

+      ASSERT((Index + 1) == (MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS + 1));

+  } else {

+    ASSERT((Index + 1) == MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS);

+  }

+

+  // End of Table

+  VirtualMemoryTable[++Index].PhysicalBase = 0;

+  VirtualMemoryTable[Index].VirtualBase  = 0;

+  VirtualMemoryTable[Index].Length       = 0;

+  VirtualMemoryTable[Index].Attributes   = (ARM_MEMORY_REGION_ATTRIBUTES)0;

+

+  *VirtualMemoryMap = VirtualMemoryTable;

 }

 

 /**

@@ -118,7 +128,8 @@ VOID ArmPlatformGetVirtualMemoryMap(ARM_MEMORY_REGION_DESCRIPTOR** VirtualMemory
 **/

 EFI_STATUS

 ArmPlatformGetAdditionalSystemMemory (

-    OUT ARM_SYSTEM_MEMORY_REGION_DESCRIPTOR** EfiMemoryMap

-) {

+  OUT ARM_SYSTEM_MEMORY_REGION_DESCRIPTOR** EfiMemoryMap

+  )

+{

   return EFI_UNSUPPORTED;

 }

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
index e5bb73d9e3..fe05824bca 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
@@ -42,5 +42,3 @@
   gArmPlatformTokenSpaceGuid.PcdStandalone

 

 [FixedPcd]

-  gArmTokenSpaceGuid.PcdNormalFdBaseAddress

-  gArmTokenSpaceGuid.PcdNormalFdSize