ArmPkg/ArmLib: remove indirection layer from timer register accessors

[mirror_edk2.git] / ArmPkg / Library / ArmGenericTimerPhyCounterLib / ArmGenericTimerPhyCounterLib.c

diff --git a/ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.c b/ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.c
index 826827fb09165d1d18ecfd59a41c231c0cc6fb5c..d04e04fb334dd3299acde576a372ca3bb54a3225 100644 (file)
--- a/ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.c
+++ b/ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.c
@@ -14,7 +14,7 @@
 **/\r
 \r
 #include <Library/ArmGenericTimerCounterLib.h>\r
-#include <Library/ArmArchTimer.h>\r
+#include <Library/ArmLib.h>\r
 \r
 VOID\r
 EFIAPI\r
@@ -24,9 +24,9 @@ ArmGenericTimerEnableTimer (
 {\r
   UINTN TimerCtrlReg;\r
 \r
-  ArmArchTimerReadReg (CntpCtl, (VOID *)&TimerCtrlReg);\r
+  TimerCtrlReg = ArmReadCntpCtl ();\r
   TimerCtrlReg |= ARM_ARCH_TIMER_ENABLE;\r
-  ArmArchTimerWriteReg (CntpCtl, (VOID *)&TimerCtrlReg);\r
+  ArmWriteCntpCtl (TimerCtrlReg);\r
 }\r
 \r
 VOID\r
@@ -37,9 +37,9 @@ ArmGenericTimerDisableTimer (
 {\r
   UINTN TimerCtrlReg;\r
 \r
-  ArmArchTimerReadReg (CntpCtl, (VOID *)&TimerCtrlReg);\r
+  TimerCtrlReg = ArmReadCntpCtl ();\r
   TimerCtrlReg &= ~ARM_ARCH_TIMER_ENABLE;\r
-  ArmArchTimerWriteReg (CntpCtl, (VOID *)&TimerCtrlReg);\r
+  ArmWriteCntpCtl (TimerCtrlReg);\r
 }\r
 \r
 VOID\r
@@ -48,7 +48,7 @@ ArmGenericTimerSetTimerFreq (
   IN   UINTN  FreqInHz\r
   )\r
 {\r
-  ArmArchTimerWriteReg (CntFrq, (VOID *)&FreqInHz);\r
+  ArmWriteCntFrq (FreqInHz);\r
 }\r
 \r
 UINTN\r
@@ -57,9 +57,7 @@ ArmGenericTimerGetTimerFreq (
   VOID\r
   )\r
 {\r
-  UINTN ArchTimerFreq = 0;\r
-  ArmArchTimerReadReg (CntFrq, (VOID *)&ArchTimerFreq);\r
-  return ArchTimerFreq;\r
+  return ArmReadCntFrq ();\r
 }\r
 \r
 UINTN\r
@@ -68,10 +66,7 @@ ArmGenericTimerGetTimerVal (
   VOID\r
   )\r
 {\r
-  UINTN ArchTimerValue;\r
-  ArmArchTimerReadReg (CntpTval, (VOID *)&ArchTimerValue);\r
-\r
-  return ArchTimerValue;\r
+  return ArmReadCntpTval ();\r
 }\r
 \r
 \r
@@ -81,7 +76,7 @@ ArmGenericTimerSetTimerVal (
   IN   UINTN   Value\r
   )\r
 {\r
-  ArmArchTimerWriteReg (CntpTval, (VOID *)&Value);\r
+  ArmWriteCntpTval (Value);\r
 }\r
 \r
 UINT64\r
@@ -90,10 +85,7 @@ ArmGenericTimerGetSystemCount (
   VOID\r
   )\r
 {\r
-  UINT64 SystemCount;\r
-  ArmArchTimerReadReg (CntPct, (VOID *)&SystemCount);\r
-\r
-  return SystemCount;\r
+  return ArmReadCntPct ();\r
 }\r
 \r
 UINTN\r
@@ -102,10 +94,7 @@ ArmGenericTimerGetTimerCtrlReg (
   VOID\r
   )\r
 {\r
-  UINTN  Value;\r
-  ArmArchTimerReadReg (CntpCtl, (VOID *)&Value);\r
-\r
-  return Value;\r
+  return ArmReadCntpCtl ();\r
 }\r
 \r
 VOID\r
@@ -114,7 +103,7 @@ ArmGenericTimerSetTimerCtrlReg (
   UINTN Value\r
   )\r
 {\r
-  ArmArchTimerWriteReg (CntpCtl, (VOID *)&Value);\r
+  ArmWriteCntpCtl (Value);\r
 }\r
 \r
 UINT64\r
@@ -123,10 +112,7 @@ ArmGenericTimerGetCompareVal (
   VOID\r
   )\r
 {\r
-  UINT64  Value;\r
-  ArmArchTimerReadReg (CntpCval, (VOID *)&Value);\r
-\r
-  return Value;\r
+  return ArmReadCntpCval ();\r
 }\r
 \r
 VOID\r
@@ -135,5 +121,5 @@ ArmGenericTimerSetCompareVal (
   IN   UINT64   Value\r
   )\r
 {\r
-  ArmArchTimerWriteReg (CntpCval, (VOID *)&Value);\r
+  ArmWriteCntpCval (Value);\r
 }\r