ArmPkg/CpuDxe: remove VirtualUncachedPages protocol and implementation

[mirror_edk2.git] / ArmPkg / Drivers / CpuDxe / CpuDxe.h

diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.h b/ArmPkg/Drivers/CpuDxe/CpuDxe.h
index 7f59ca653c38bb1f21cde8b3b630723d577f7c42..a00fc3064362de158fb757ab498087218a302889 100644 (file)
--- a/ArmPkg/Drivers/CpuDxe/CpuDxe.h
+++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.h
@@ -35,22 +35,13 @@
 #include <Protocol/Cpu.h>\r
 #include <Protocol/DebugSupport.h>\r
 #include <Protocol/DebugSupportPeriodicCallback.h>\r
-#include <Protocol/VirtualUncachedPages.h>\r
 #include <Protocol/LoadedImage.h>\r
 \r
 \r
-#define EFI_MEMORY_CACHETYPE_MASK     (EFI_MEMORY_UC  | \\r
-                                       EFI_MEMORY_WC  | \\r
-                                       EFI_MEMORY_WT  | \\r
-                                       EFI_MEMORY_WB  | \\r
-                                       EFI_MEMORY_UCE   \\r
-                                       )\r
-\r
-\r
 /**\r
-  This function registers and enables the handler specified by InterruptHandler for a processor \r
-  interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the \r
-  handler for the processor interrupt or exception type specified by InterruptType is uninstalled. \r
+  This function registers and enables the handler specified by InterruptHandler for a processor\r
+  interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the\r
+  handler for the processor interrupt or exception type specified by InterruptType is uninstalled.\r
   The installed handler is called once for each processor interrupt or exception.\r
 \r
   @param  InterruptType    A pointer to the processor's current interrupt state. Set to TRUE if interrupts\r
@@ -75,9 +66,9 @@ RegisterInterruptHandler (
 \r
 \r
 /**\r
-  This function registers and enables the handler specified by InterruptHandler for a processor \r
-  interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the \r
-  handler for the processor interrupt or exception type specified by InterruptType is uninstalled. \r
+  This function registers and enables the handler specified by InterruptHandler for a processor\r
+  interrupt or exception type specified by InterruptType. If InterruptHandler is NULL, then the\r
+  handler for the processor interrupt or exception type specified by InterruptType is uninstalled.\r
   The installed handler is called once for each processor interrupt or exception.\r
 \r
   @param  InterruptType    A pointer to the processor's current interrupt state. Set to TRUE if interrupts\r
@@ -120,7 +111,7 @@ SyncCacheConfig (
   IN  EFI_CPU_ARCH_PROTOCOL *CpuProtocol\r
   );\r
 \r
-EFI_STATUS \r
+EFI_STATUS\r
 ConvertSectionToPages (\r
   IN EFI_PHYSICAL_ADDRESS  BaseAddress\r
   );\r
@@ -148,15 +139,33 @@ SetMemoryAttributes (
   IN EFI_PHYSICAL_ADDRESS      VirtualMask\r
   );\r
 \r
+// The ARM Attributes might be defined on 64-bit (case of the long format description table)\r
+UINT64\r
+EfiAttributeToArmAttribute (\r
+  IN UINT64                    EfiAttributes\r
+  );\r
+\r
+EFI_STATUS\r
+GetMemoryRegion (\r
+  IN OUT UINTN                   *BaseAddress,\r
+  OUT    UINTN                   *RegionLength,\r
+  OUT    UINTN                   *RegionAttributes\r
+  );\r
+\r
+VOID\r
+GetRootTranslationTableInfo (\r
+  IN  UINTN    T0SZ,\r
+  OUT UINTN   *TableLevel,\r
+  OUT UINTN   *TableEntryCount\r
+  );\r
+\r
 EFI_STATUS\r
 SetGcdMemorySpaceAttributes (\r
-  IN EFI_GCD_MEMORY_SPACE_DESCRIPTOR     *MemorySpaceMap,\r
+  IN EFI_GCD_MEMORY_SPACE_DESCRIPTOR    *MemorySpaceMap,\r
   IN UINTN                               NumberOfDescriptors,\r
   IN EFI_PHYSICAL_ADDRESS                BaseAddress,\r
   IN UINT64                              Length,\r
   IN UINT64                              Attributes\r
   );\r
 \r
-extern VIRTUAL_UNCACHED_PAGES_PROTOCOL  gVirtualUncachedPages;\r
-\r
 #endif // __CPU_DXE_ARM_EXCEPTION_H__\r