From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 22 Jun 2006 14:07:22 +0000 (+0000)
Subject: In before, FixedPcdGetxx macro was defined as global variable, it is wrong. It should... 
X-Git-Tag: edk2-stable201903~25196
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=dc530c7b9df56725243aae875ed90ac1138e4628

In before, FixedPcdGetxx macro was defined as global variable, it is wrong. It should be defined as value directly, and module developer can use it to define length of array.
1) Change macro FixedPcdGetxx to value macro.
2) Change some wrong macro usage in library.


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

diff --git a/MdePkg/Include/Library/PcdLib.h b/MdePkg/Include/Library/PcdLib.h
index c4e5502a0d..b513a61e86 100644
--- a/MdePkg/Include/Library/PcdLib.h
+++ b/MdePkg/Include/Library/PcdLib.h
@@ -26,23 +26,23 @@ Module Name: PcdLib.h
 //
 // Feature Flag is in the form of a global constant
 //
-#define FeaturePcdGet(TokenName)     _gPcd_FixedAtBuild_##TokenName
+#define FeaturePcdGet(TokenName)     _PCD_VALUE_##TokenName
 
 
 //
 // Fixed is fixed at build time
 //
-#define FixedPcdGet8(TokenName)     _gPcd_FixedAtBuild_##TokenName
-#define FixedPcdGet16(TokenName)    _gPcd_FixedAtBuild_##TokenName
-#define FixedPcdGet32(TokenName)    _gPcd_FixedAtBuild_##TokenName
-#define FixedPcdGet64(TokenName)    _gPcd_FixedAtBuild_##TokenName
-#define FixedPcdGetBool(TokenName)  _gPcd_FixedAtBuild_##TokenName
+#define FixedPcdGet8(TokenName)     _PCD_VALUE_##TokenName
+#define FixedPcdGet16(TokenName)    _PCD_VALUE_##TokenName
+#define FixedPcdGet32(TokenName)    _PCD_VALUE_##TokenName
+#define FixedPcdGet64(TokenName)    _PCD_VALUE_##TokenName
+#define FixedPcdGetBool(TokenName)  _PCD_VALUE_##TokenName
 
 
 //
 // BugBug: This works for strings, but not constants.
 //
-#define FixedPcdGetPtr(TokenName)    ((VOID *)_gPcd_FixedAtBuild_##TokenName)
+#define FixedPcdGetPtr(TokenName)    ((VOID *)_PCD_VALUE_##TokenName)
 
 
 //
diff --git a/MdePkg/Library/BaseLib/LinkedList.c b/MdePkg/Library/BaseLib/LinkedList.c
index 9ad1b0875b..be7e0a64b7 100644
--- a/MdePkg/Library/BaseLib/LinkedList.c
+++ b/MdePkg/Library/BaseLib/LinkedList.c
@@ -33,7 +33,7 @@ IsNodeInList (
   ASSERT (List->BackLink != NULL);
   ASSERT (Node != NULL);
 
-  Count = FixedPcdGet32 (PcdMaximumLinkedListLength);
+  Count = PcdGet32 (PcdMaximumLinkedListLength);
   if (Count != 0) {
     Count++;
   }
@@ -45,7 +45,7 @@ IsNodeInList (
   } while ((Ptr != List) && (Ptr != Node) && (Count > 0));
   Found = (BOOLEAN)(Ptr == Node);
 
-  if (FixedPcdGet32 (PcdMaximumLinkedListLength) > 0) {
+  if (PcdGet32 (PcdMaximumLinkedListLength) > 0) {
     while ((Count > 0) && (Ptr != List)) {
       Ptr = Ptr->ForwardLink;
       Count--;
diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c
index 0483fc712e..c4330fa5d2 100644
--- a/MdePkg/Library/BaseLib/String.c
+++ b/MdePkg/Library/BaseLib/String.c
@@ -155,8 +155,8 @@ StrLen (
     // If PcdMaximumUnicodeStringLength is not zero,
     // length should not more than PcdMaximumUnicodeStringLength
     //
-    if (FixedPcdGet32 (PcdMaximumUnicodeStringLength) != 0) {
-      ASSERT (Length < FixedPcdGet32 (PcdMaximumUnicodeStringLength));
+    if (PcdGet32 (PcdMaximumUnicodeStringLength) != 0) {
+      ASSERT (Length < PcdGet32 (PcdMaximumUnicodeStringLength));
     }
   }
   return Length;
@@ -520,8 +520,8 @@ AsciiStrLen (
     // If PcdMaximumUnicodeStringLength is not zero,
     // length should not more than PcdMaximumUnicodeStringLength
     //
-    if (FixedPcdGet32 (PcdMaximumAsciiStringLength) != 0) {
-      ASSERT (Length < FixedPcdGet32 (PcdMaximumAsciiStringLength));
+    if (PcdGet32 (PcdMaximumAsciiStringLength) != 0) {
+      ASSERT (Length < PcdGet32 (PcdMaximumAsciiStringLength));
     }
   }
   return Length;
diff --git a/MdePkg/Library/BaseLib/Synchronization.c b/MdePkg/Library/BaseLib/Synchronization.c
index 4c4734523d..0d51956d74 100644
--- a/MdePkg/Library/BaseLib/Synchronization.c
+++ b/MdePkg/Library/BaseLib/Synchronization.c
@@ -131,12 +131,12 @@ AcquireSpinLock (
   Tick = 0;
   Start = 0;
   End = 0;
-  if (FixedPcdGet32 (PcdSpinLockTimeout) > 0) {
+  if (PcdGet32 (PcdSpinLockTimeout) > 0) {
     Tick = GetPerformanceCounter ();
     Timeout = DivU64x32 (
                 MultU64x32 (
                   GetPerformanceCounterProperties (&Start, &End),
-                  FixedPcdGet32 (PcdSpinLockTimeout)
+                  PcdGet32 (PcdSpinLockTimeout)
                   ),
                 1000000
                 );