diff options
| author | Olivier Martin <olivier.martin@arm.com> | 2014-03-01 10:57:09 +0000 |
|---|---|---|
| committer | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-03-01 10:57:09 +0000 |
| commit | 0ff0e414d13afd3cad5017a98bc1e257f64ed6d4 (patch) | |
| tree | 00b8a98f10d9bc2837d2cc9c973d797e5dc899a2 | |
| parent | f716d7b8c5aca0d913edd8925808e474df4d3bdb (diff) | |
| download | edk2-platforms-0ff0e414d13afd3cad5017a98bc1e257f64ed6d4.tar.xz | |
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
| -rw-r--r-- | ArmPkg/Include/Library/ArmLib.h | 44 | ||||
| -rw-r--r-- | ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h | 65 | ||||
| -rw-r--r-- | ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h | 41 |
3 files changed, 43 insertions, 107 deletions
diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h index 1726984f5b..9694b9d06d 100644 --- a/ArmPkg/Include/Library/ArmLib.h +++ b/ArmPkg/Include/Library/ArmLib.h @@ -281,6 +281,24 @@ ArmCleanInvalidateDataCacheEntryByMVA ( VOID
EFIAPI
+ArmInvalidateDataCacheEntryBySetWay (
+ IN UINTN SetWayFormat
+ );
+
+VOID
+EFIAPI
+ArmCleanDataCacheEntryBySetWay (
+ IN UINTN SetWayFormat
+ );
+
+VOID
+EFIAPI
+ArmCleanInvalidateDataCacheEntryBySetWay (
+ IN UINTN SetWayFormat
+ );
+
+VOID
+EFIAPI
ArmEnableDataCache (
VOID
);
@@ -317,6 +335,12 @@ ArmDisableMmu ( VOID
EFIAPI
+ArmEnableCachesAndMmu (
+ VOID
+ );
+
+VOID
+EFIAPI
ArmDisableCachesAndMmu (
VOID
);
@@ -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 (
@@ -458,6 +494,12 @@ ArmSetHighVectors ( VOID
EFIAPI
+ArmDrainWriteBuffer (
+ VOID
+ );
+
+VOID
+EFIAPI
ArmDataMemoryBarrier (
VOID
);
diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h index 04e3be0426..c8bb84365b 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h +++ b/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 (
diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h index 88848da583..f183a1cca3 100644 --- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h +++ b/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 (
|