From 55bff42e00b9ccd8fda408cd1fd4db6442c0a266 Mon Sep 17 00:00:00 2001
From: andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 21 Apr 2010 22:06:00 +0000
Subject: Cleanup name issues with PCD entries.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10389 6f19259b-4bc3-4df7-8a09-765794883524
---
 Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf | 4 ++--
 Omap35xxPkg/Library/Omap35xxTimerLib/TimerLib.c           | 6 +++---
 Omap35xxPkg/Omap35xxPkg.dsc                               | 4 ++--
 Omap35xxPkg/TimerDxe/Timer.c                              | 2 +-
 Omap35xxPkg/TimerDxe/TimerDxe.inf                         | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'Omap35xxPkg')

diff --git a/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf b/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
index 515dff9f65..8ef9605ec2 100644
--- a/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
+++ b/Omap35xxPkg/Library/Omap35xxTimerLib/Omap35xxTimerLib.inf
@@ -39,7 +39,7 @@
   IoLib
 
 [Pcd]
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFreqencyInHz
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedFdPerformanceCounterPeriodInNanoseconds
+  gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz
+  gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterPeriodInNanoseconds
   gOmap35xxTokenSpaceGuid.PcdOmap35xxFreeTimer
 
diff --git a/Omap35xxPkg/Library/Omap35xxTimerLib/TimerLib.c b/Omap35xxPkg/Library/Omap35xxTimerLib/TimerLib.c
index 1b1f2a9dbe..16a3359dff 100644
--- a/Omap35xxPkg/Library/Omap35xxTimerLib/TimerLib.c
+++ b/Omap35xxPkg/Library/Omap35xxTimerLib/TimerLib.c
@@ -55,7 +55,7 @@ NanoSecondDelay (
   UINT32  ElapsedTime;
   UINT32  TimerCountRegister;
 
-  Delay = (NanoSeconds / PcdGet32(PcdEmbeddedFdPerformanceCounterPeriodInNanoseconds)) + 1;
+  Delay = (NanoSeconds / PcdGet32(PcdEmbeddedPerformanceCounterPeriodInNanoseconds)) + 1;
   
   TimerCountRegister = TimerBase(PcdGet32(PcdOmap35xxFreeTimer)) + GPTIMER_TCRR;
 
@@ -67,7 +67,7 @@ NanoSecondDelay (
     ElapsedTime = CurrentTime - StartTime;
   } while (ElapsedTime < Delay);
 
-  NanoSeconds = ElapsedTime * PcdGet32(PcdEmbeddedFdPerformanceCounterPeriodInNanoseconds);
+  NanoSeconds = ElapsedTime * PcdGet32(PcdEmbeddedPerformanceCounterPeriodInNanoseconds);
 
   return NanoSeconds;
 }
@@ -98,5 +98,5 @@ GetPerformanceCounterProperties (
     *EndValue = 0xFFFFFFFF;
   }
   
-  return PcdGet64(PcdEmbeddedPerformanceCounterFreqencyInHz);
+  return PcdGet64(PcdEmbeddedPerformanceCounterFrequencyInHz);
 }
diff --git a/Omap35xxPkg/Omap35xxPkg.dsc b/Omap35xxPkg/Omap35xxPkg.dsc
index 9f1dfe647f..99a0651779 100644
--- 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 e7684eedda..e99d345193 100644
--- 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 caee465d7a..f4167420b5 100644
--- 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]
-- 
cgit v1.2.3