ArmPkg/ArmLib: Move common definitions from ArmV7Lib.h & AArch64Lib.h to ArmLib.h

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15272 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index 1726984f5baf142672fb7b73904293f62f8dbf0f..9694b9d06d0f9408cebe5db66abc8da72fbe721b 100644 (file)
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -279,6 +279,24 @@ ArmCleanInvalidateDataCacheEntryByMVA (
   IN  UINTN   Address\r
   );\r
 \r
+VOID\r
+EFIAPI\r
+ArmInvalidateDataCacheEntryBySetWay (\r
+  IN  UINTN  SetWayFormat\r
+  );\r
+\r
+VOID\r
+EFIAPI\r
+ArmCleanDataCacheEntryBySetWay (\r
+  IN  UINTN  SetWayFormat\r
+  );\r
+\r
+VOID\r
+EFIAPI\r
+ArmCleanInvalidateDataCacheEntryBySetWay (\r
+  IN  UINTN   SetWayFormat\r
+  );\r
+\r
 VOID\r
 EFIAPI\r
 ArmEnableDataCache (\r
@@ -315,6 +333,12 @@ ArmDisableMmu (
   VOID\r
   );\r
 \r
+VOID\r
+EFIAPI\r
+ArmEnableCachesAndMmu (\r
+  VOID\r
+  );\r
+\r
 VOID\r
 EFIAPI\r
 ArmDisableCachesAndMmu (\r
@@ -345,9 +369,15 @@ ArmGetInterruptState (
   VOID\r
   );\r
 \r
+VOID\r
+EFIAPI\r
+ArmEnableAsynchronousAbort (\r
+  VOID\r
+  );\r
+\r
 UINTN\r
 EFIAPI\r
-ArmDisableIrq (\r
+ArmDisableAsynchronousAbort (\r
   VOID\r
   );\r
 \r
@@ -357,6 +387,12 @@ ArmEnableIrq (
   VOID\r
   );\r
 \r
+UINTN\r
+EFIAPI\r
+ArmDisableIrq (\r
+  VOID\r
+  );\r
+\r
 VOID\r
 EFIAPI\r
 ArmEnableFiq (\r
@@ -456,6 +492,12 @@ ArmSetHighVectors (
   VOID\r
   );\r
 \r
+VOID\r
+EFIAPI\r
+ArmDrainWriteBuffer (\r
+  VOID\r
+  );\r
+\r
 VOID\r
 EFIAPI\r
 ArmDataMemoryBarrier (\r

diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h
index 04e3be0426e5fc1ad6939e9016ad6d8c6f0ac154..c8bb84365bb6ac32e3ef5f861fb6d470bc43d29b 100644 (file)
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h
@@ -18,71 +18,6 @@
 \r
 typedef VOID (*AARCH64_CACHE_OPERATION)(UINTN);\r
 \r
-VOID\r
-EFIAPI\r
-ArmDrainWriteBuffer (\r
-  VOID\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-ArmInvalidateDataCacheEntryBySetWay (\r
-  IN  UINTN  SetWayFormat\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-ArmCleanDataCacheEntryBySetWay (\r
-  IN  UINTN  SetWayFormat\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-ArmCleanDataCacheToPoUEntryBySetWay (\r
-  IN  UINTN  SetWayFormat\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-ArmCleanInvalidateDataCacheEntryBySetWay (\r
-  IN  UINTN   SetWayFormat\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-ArmEnableAsynchronousAbort (\r
-  VOID\r
-  );\r
-\r
-UINTN\r
-EFIAPI\r
-ArmDisableAsynchronousAbort (\r
-  VOID\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-ArmEnableIrq (\r
-  VOID\r
-  );\r
-\r
-UINTN\r
-EFIAPI\r
-ArmDisableIrq (\r
-  VOID\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-ArmEnableFiq (\r
-  VOID\r
-  );\r
-\r
-UINTN\r
-EFIAPI\r
-ArmDisableFiq (\r
-  VOID\r
-  );\r
 \r
 VOID\r
 AArch64PerformPoUDataCacheOperation (\r

diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h
index 88848da5838c7d1f27456bf60966b2e58971d5d7..f183a1cca36c5ae9ededc93181adf643ff04d3b5 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h
@@ -17,47 +17,6 @@
 \r
 typedef VOID (*ARM_V7_CACHE_OPERATION)(UINT32);\r
 \r
-VOID\r
-EFIAPI\r
-ArmDrainWriteBuffer (\r
-  VOID\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-ArmInvalidateDataCacheEntryBySetWay (\r
-  IN  UINT32  SetWayFormat\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-ArmCleanDataCacheEntryBySetWay (\r
-  IN  UINT32  SetWayFormat\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-ArmCleanDataCacheToPoUEntryBySetWay (\r
-  IN  UINT32  SetWayFormat\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-ArmCleanInvalidateDataCacheEntryBySetWay (\r
-  IN  UINT32   SetWayFormat\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-ArmEnableAsynchronousAbort (\r
-  VOID\r
-  );\r
-\r
-UINTN\r
-EFIAPI\r
-ArmDisableAsynchronousAbort (\r
-  VOID\r
-  );\r
 \r
 VOID\r
 ArmV7PerformPoUDataCacheOperation (\r