Cleanup name issues with PCD entries.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10389 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf b/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
index 515dff9f65e1b9934fbe09e9101b41331e95da77..8ef9605ec2d9de8044edc3bab8c189b4690c11c2 100644 (file)
--- a/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
+++ b/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
@@ -39,7 +39,7 @@
   IoLib\r
 \r
 [Pcd]\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFreqencyInHz\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdPerformanceCounterPeriodInNanoseconds\r
+  gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz\r
+  gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterPeriodInNanoseconds\r
   gOmap35xxTokenSpaceGuid.PcdOmap35xxFreeTimer\r
 \r

diff --git a/Omap35xxPkg/Library/Omap35xxTimerLib/TimerLib.c b/Omap35xxPkg/Library/Omap35xxTimerLib/TimerLib.c
index 1b1f2a9dbe227ba26042174555dfe37b99ae5614..16a3359dff920d3fe20cd5a11055b0c563ec3323 100644 (file)
--- a/Omap35xxPkg/Library/Omap35xxTimerLib/TimerLib.c
+++ b/Omap35xxPkg/Library/Omap35xxTimerLib/TimerLib.c
@@ -55,7 +55,7 @@ NanoSecondDelay (
   UINT32  ElapsedTime;\r
   UINT32  TimerCountRegister;\r
 \r
-  Delay = (NanoSeconds / PcdGet32(PcdEmbeddedFdPerformanceCounterPeriodInNanoseconds)) + 1;\r
+  Delay = (NanoSeconds / PcdGet32(PcdEmbeddedPerformanceCounterPeriodInNanoseconds)) + 1;\r
   \r
   TimerCountRegister = TimerBase(PcdGet32(PcdOmap35xxFreeTimer)) + GPTIMER_TCRR;\r
 \r
@@ -67,7 +67,7 @@ NanoSecondDelay (
     ElapsedTime = CurrentTime - StartTime;\r
   } while (ElapsedTime < Delay);\r
 \r
-  NanoSeconds = ElapsedTime * PcdGet32(PcdEmbeddedFdPerformanceCounterPeriodInNanoseconds);\r
+  NanoSeconds = ElapsedTime * PcdGet32(PcdEmbeddedPerformanceCounterPeriodInNanoseconds);\r
 \r
   return NanoSeconds;\r
 }\r
@@ -98,5 +98,5 @@ GetPerformanceCounterProperties (
     *EndValue = 0xFFFFFFFF;\r
   }\r
   \r
-  return PcdGet64(PcdEmbeddedPerformanceCounterFreqencyInHz);\r
+  return PcdGet64(PcdEmbeddedPerformanceCounterFrequencyInHz);\r
 }\r

diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc
index 9f1dfe647f04889d4a6bece70523cb66c3876b1a..99a065177996e9e7606da1cbdc7d0df1a8d7f752 100644 (file)
--- a/Omap35xxPkg/Omap35xxPkg.dsc
+++ b/Omap35xxPkg/Omap35xxPkg.dsc
@@ -152,8 +152,8 @@
   gOmap35xxTokenSpaceGuid.PcdOmap35xxArchTimer|3
   gOmap35xxTokenSpaceGuid.PcdOmap35xxFreeTimer|4
   gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdPerformanceCounterPeriodInNanoseconds|77
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdPerformanceCounterFrequencyInHz|13000000
+  gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterPeriodInNanoseconds|77
+  gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz|13000000
   
   #
   # ARM Pcds

diff --git a/Omap35xxPkg/TimerDxe/Timer.c b/Omap35xxPkg/TimerDxe/Timer.c
index e7684eeddacbf332f1b14dfacad495cbc5e302fe..e99d3451932299ba200a843c71a8bbc5ffd75379 100644 (file)
--- a/Omap35xxPkg/TimerDxe/Timer.c
+++ b/Omap35xxPkg/TimerDxe/Timer.c
@@ -197,7 +197,7 @@ TimerDriverSetTimerPeriod (
     Status = gInterrupt->DisableInterruptSource(gInterrupt, gVector);    
   } else {  
     // Calculate required timer count
-    TimerCount = DivU64x32(TimerPeriod * 100, PcdGet32(PcdEmbeddedFdPerformanceCounterPeriodInNanoseconds));
+    TimerCount = DivU64x32(TimerPeriod * 100, PcdGet32(PcdEmbeddedPerformanceCounterPeriodInNanoseconds));
 
     // Set GPTIMER3 Load register
     LoadValue = (INT32) -TimerCount;

diff --git a/Omap35xxPkg/TimerDxe/TimerDxe.inf b/Omap35xxPkg/TimerDxe/TimerDxe.inf
index caee465d7a5bd7cc417753e10b7a88b027d5be57..f4167420b513c16f5555344a4e566a7db041869b 100644 (file)
--- a/Omap35xxPkg/TimerDxe/TimerDxe.inf
+++ b/Omap35xxPkg/TimerDxe/TimerDxe.inf
@@ -51,7 +51,7 @@
 
 [Pcd.common]
   gEmbeddedTokenSpaceGuid.PcdTimerPeriod
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdPerformanceCounterPeriodInNanoseconds
+  gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterPeriodInNanoseconds
   gOmap35xxTokenSpaceGuid.PcdOmap35xxArchTimer
 
 [Depex]