ArmPkg: Move TimerDxe and ArmArchTimerLib to new ArmGenericTimerCounterLib

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

diff --git a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c
index ec4c39dbc9893381875d68d57e60c19302d8b74f..5d8e006cc99c0889aa23e2602b2ec758b28ec5f6 100644 (file)
--- a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c
+++ b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c
@@ -20,7 +20,7 @@
 #include <Library/TimerLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/PcdLib.h>\r
-#include <Library/ArmArchTimer.h>\r
+#include <Library/ArmGenericTimerCounterLib.h>\r
 \r
 #define TICKS_PER_MICRO_SEC     (PcdGet32 (PcdArmArchTimerFreqInHz)/1000000U)\r
 \r
@@ -47,13 +47,13 @@ TimerConstructor (
     // Only set the frequency for ARMv7. We expect the secure firmware to have already do it\r
     // If the security extensions are not implemented set Timer Frequency\r
     if ((ArmReadIdPfr1 () & ARM_PFR1_SEC) == 0x0) {\r
-      ArmArchTimerSetTimerFreq (PcdGet32 (PcdArmArchTimerFreqInHz));\r
+      ArmGenericTimerSetTimerFreq (PcdGet32 (PcdArmArchTimerFreqInHz));\r
     }\r
 #endif\r
 \r
     // Architectural Timer Frequency must be set in the Secure privileged(if secure extensions are supported) mode.\r
     // If the reset value (0) is returned just ASSERT.\r
-    TimerFreq = ArmArchTimerGetTimerFreq ();\r
+    TimerFreq = ArmGenericTimerGetTimerFreq ();\r
     ASSERT (TimerFreq != 0);\r
 \r
   } else {\r
@@ -88,13 +88,13 @@ MicroSecondDelay (
   TimerTicks64 = (MicroSeconds * PcdGet32 (PcdArmArchTimerFreqInHz)) / 1000000U;\r
 \r
   // Read System Counter value\r
-  SystemCounterVal = ArmArchTimerGetSystemCount ();\r
+  SystemCounterVal = ArmGenericTimerGetSystemCount ();\r
 \r
   TimerTicks64 += SystemCounterVal;\r
 \r
   // Wait until delay count is expired.\r
   while (SystemCounterVal < TimerTicks64) {\r
-    SystemCounterVal = ArmArchTimerGetSystemCount ();\r
+    SystemCounterVal = ArmGenericTimerGetSystemCount ();\r
   }\r
 \r
   return MicroSeconds;\r
@@ -149,7 +149,7 @@ GetPerformanceCounter (
   )\r
 {\r
   // Just return the value of system count\r
-  return ArmArchTimerGetSystemCount ();\r
+  return ArmGenericTimerGetSystemCount ();\r
 }\r
 \r
 /**\r
@@ -192,5 +192,5 @@ GetPerformanceCounterProperties (
     *EndValue = 0xFFFFFFFFFFFFFFFFUL;\r
   }\r
 \r
-  return (UINT64)ArmArchTimerGetTimerFreq ();\r
+  return (UINT64)ArmGenericTimerGetTimerFreq ();\r
 }\r