ArmPkg/ArmLib: move ArmReadIdPfr0/1 into private header ArmV7Lib.h

ArmReadIdPfr0 () and ArmReadIdPfr1 () are now used only inside ArmLib.
Remove the prototypes from the public header to discourage new id
register accessor additions, and direct id register access in general.
Move them into local header Arm/ArmV7Lib.h.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@arm.com>

diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index c2ed72112b73d2e36c11abecc167aa5edad68f4d..26cb05def0a21968bc8af3190a73ab08eeba7fda 100644 (file)
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -133,18 +133,6 @@ ArmIsArchTimerImplemented (
   VOID\r
   );\r
 \r
-UINTN\r
-EFIAPI\r
-ArmReadIdPfr0 (\r
-  VOID\r
-  );\r
-\r
-UINTN\r
-EFIAPI\r
-ArmReadIdPfr1 (\r
-  VOID\r
-  );\r
-\r
 UINTN\r
 EFIAPI\r
 ArmCacheInfo (\r

diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h
index 93183e67230e8c799750ec1f933cbc759a2d9d1f..bb7bda0a3aeb001749a7b3cfa7be2805942fd5be 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h
+++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h
@@ -48,5 +48,17 @@ ArmCleanInvalidateDataCacheEntryBySetWay (
   IN  UINTN   SetWayFormat\r
   );\r
 \r
+UINTN\r
+EFIAPI\r
+ArmReadIdPfr0 (\r
+  VOID\r
+  );\r
+\r
+UINTN\r
+EFIAPI\r
+ArmReadIdPfr1 (\r
+  VOID\r
+  );\r
+\r
 #endif // __ARM_V7_LIB_H__\r
 \r