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

ArmPkg/Include/Library/ArmLib.h

@@ -279,6 +279,24 @@ ArmCleanInvalidateDataCacheEntryByMVA (
   IN  UINTN   Address
   );
 
+VOID
+EFIAPI
+ArmInvalidateDataCacheEntryBySetWay (
+  IN  UINTN  SetWayFormat
+  );
+
+VOID
+EFIAPI
+ArmCleanDataCacheEntryBySetWay (
+  IN  UINTN  SetWayFormat
+  );
+
+VOID
+EFIAPI
+ArmCleanInvalidateDataCacheEntryBySetWay (
+  IN  UINTN   SetWayFormat
+  );
+
 VOID
 EFIAPI
 ArmEnableDataCache (
@@ -315,6 +333,12 @@ ArmDisableMmu (
   VOID
   );
 
+VOID
+EFIAPI
+ArmEnableCachesAndMmu (
+  VOID
+  );
+
 VOID
 EFIAPI
 ArmDisableCachesAndMmu (
@@ -345,9 +369,15 @@ ArmGetInterruptState (
   VOID
   );
 
+VOID
+EFIAPI
+ArmEnableAsynchronousAbort (
+  VOID
+  );
+
 UINTN
 EFIAPI
-ArmDisableIrq (
+ArmDisableAsynchronousAbort (
   VOID
   );
 
@@ -357,6 +387,12 @@ ArmEnableIrq (
   VOID
   );
 
+UINTN
+EFIAPI
+ArmDisableIrq (
+  VOID
+  );
+
 VOID
 EFIAPI
 ArmEnableFiq (
@@ -456,6 +492,12 @@ ArmSetHighVectors (
   VOID
   );
 
+VOID
+EFIAPI
+ArmDrainWriteBuffer (
+  VOID
+  );
+
 VOID
 EFIAPI
 ArmDataMemoryBarrier (

ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h

@@ -18,71 +18,6 @@
 
 typedef VOID (*AARCH64_CACHE_OPERATION)(UINTN);
 
-VOID
-EFIAPI
-ArmDrainWriteBuffer (
-  VOID
-  );
-
-VOID
-EFIAPI
-ArmInvalidateDataCacheEntryBySetWay (
-  IN  UINTN  SetWayFormat
-  );
-
-VOID
-EFIAPI
-ArmCleanDataCacheEntryBySetWay (
-  IN  UINTN  SetWayFormat
-  );
-
-VOID
-EFIAPI
-ArmCleanDataCacheToPoUEntryBySetWay (
-  IN  UINTN  SetWayFormat
-  );
-
-VOID
-EFIAPI
-ArmCleanInvalidateDataCacheEntryBySetWay (
-  IN  UINTN   SetWayFormat
-  );
-
-VOID
-EFIAPI
-ArmEnableAsynchronousAbort (
-  VOID
-  );
-
-UINTN
-EFIAPI
-ArmDisableAsynchronousAbort (
-  VOID
-  );
-
-VOID
-EFIAPI
-ArmEnableIrq (
-  VOID
-  );
-
-UINTN
-EFIAPI
-ArmDisableIrq (
-  VOID
-  );
-
-VOID
-EFIAPI
-ArmEnableFiq (
-  VOID
-  );
-
-UINTN
-EFIAPI
-ArmDisableFiq (
-  VOID
-  );
 
 VOID
 AArch64PerformPoUDataCacheOperation (

ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h

@@ -17,47 +17,6 @@
 
 typedef VOID (*ARM_V7_CACHE_OPERATION)(UINT32);
 
-VOID
-EFIAPI
-ArmDrainWriteBuffer (
-  VOID
-  );
-
-VOID
-EFIAPI
-ArmInvalidateDataCacheEntryBySetWay (
-  IN  UINT32  SetWayFormat
-  );
-
-VOID
-EFIAPI
-ArmCleanDataCacheEntryBySetWay (
-  IN  UINT32  SetWayFormat
-  );
-
-VOID
-EFIAPI
-ArmCleanDataCacheToPoUEntryBySetWay (
-  IN  UINT32  SetWayFormat
-  );
-
-VOID
-EFIAPI
-ArmCleanInvalidateDataCacheEntryBySetWay (
-  IN  UINT32   SetWayFormat
-  );
-
-VOID
-EFIAPI
-ArmEnableAsynchronousAbort (
-  VOID
-  );
-
-UINTN
-EFIAPI
-ArmDisableAsynchronousAbort (
-  VOID
-  );
 
 VOID
 ArmV7PerformPoUDataCacheOperation (