In before, FixedPcdGetxx macro was defined as global variable, it is wrong. It should...

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 c4e5502a0d065fff9c328aabd7a5c2430fa1dfb3..b513a61e86034f327cc15799b7f7628c345b348c 100644 (file)
--- a/MdePkg/Include/Library/PcdLib.h
+++ b/MdePkg/Include/Library/PcdLib.h
@@ -26,23 +26,23 @@ Module Name: PcdLib.h
 //\r
 // Feature Flag is in the form of a global constant\r
 //\r
 //\r
 // Feature Flag is in the form of a global constant\r
 //\r

-#define FeaturePcdGet(TokenName)     _gPcd_FixedAtBuild_##TokenName\r
+#define FeaturePcdGet(TokenName)     _PCD_VALUE_##TokenName\r

 \r
 \r
 //\r
 // Fixed is fixed at build time\r
 //\r
 \r
 \r
 //\r
 // Fixed is fixed at build time\r
 //\r

-#define FixedPcdGet8(TokenName)     _gPcd_FixedAtBuild_##TokenName\r
-#define FixedPcdGet16(TokenName)    _gPcd_FixedAtBuild_##TokenName\r
-#define FixedPcdGet32(TokenName)    _gPcd_FixedAtBuild_##TokenName\r
-#define FixedPcdGet64(TokenName)    _gPcd_FixedAtBuild_##TokenName\r
-#define FixedPcdGetBool(TokenName)  _gPcd_FixedAtBuild_##TokenName\r
+#define FixedPcdGet8(TokenName)     _PCD_VALUE_##TokenName\r
+#define FixedPcdGet16(TokenName)    _PCD_VALUE_##TokenName\r
+#define FixedPcdGet32(TokenName)    _PCD_VALUE_##TokenName\r
+#define FixedPcdGet64(TokenName)    _PCD_VALUE_##TokenName\r
+#define FixedPcdGetBool(TokenName)  _PCD_VALUE_##TokenName\r

 \r
 \r
 //\r
 // BugBug: This works for strings, but not constants.\r
 //\r
 \r
 \r
 //\r
 // BugBug: This works for strings, but not constants.\r
 //\r

-#define FixedPcdGetPtr(TokenName)    ((VOID *)_gPcd_FixedAtBuild_##TokenName)\r
+#define FixedPcdGetPtr(TokenName)    ((VOID *)_PCD_VALUE_##TokenName)\r

 \r
 \r
 //\r
 \r
 \r
 //\r

diff --git a/MdePkg/Library/BaseLib/LinkedList.c b/MdePkg/Library/BaseLib/LinkedList.c
index 9ad1b0875b0ecc3d1280a610e98144235c9449e4..be7e0a64b762557a98acc8651ea5281bd35f546d 100644 (file)
--- a/MdePkg/Library/BaseLib/LinkedList.c
+++ b/MdePkg/Library/BaseLib/LinkedList.c
@@ -33,7 +33,7 @@ IsNodeInList (
   ASSERT (List->BackLink != NULL);\r
   ASSERT (Node != NULL);\r
 \r
   ASSERT (List->BackLink != NULL);\r
   ASSERT (Node != NULL);\r
 \r

-  Count = FixedPcdGet32 (PcdMaximumLinkedListLength);\r
+  Count = PcdGet32 (PcdMaximumLinkedListLength);\r

   if (Count != 0) {\r
     Count++;\r
   }\r
   if (Count != 0) {\r
     Count++;\r
   }\r


@@ -45,7 +45,7 @@ IsNodeInList (
   } while ((Ptr != List) && (Ptr != Node) && (Count > 0));\r
   Found = (BOOLEAN)(Ptr == Node);\r
 \r
   } while ((Ptr != List) && (Ptr != Node) && (Count > 0));\r
   Found = (BOOLEAN)(Ptr == Node);\r
 \r

-  if (FixedPcdGet32 (PcdMaximumLinkedListLength) > 0) {\r
+  if (PcdGet32 (PcdMaximumLinkedListLength) > 0) {\r

     while ((Count > 0) && (Ptr != List)) {\r
       Ptr = Ptr->ForwardLink;\r
       Count--;\r
     while ((Count > 0) && (Ptr != List)) {\r
       Ptr = Ptr->ForwardLink;\r
       Count--;\r

diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c
index 0483fc712ef41e37502c6aab59f706f6996edfc4..c4330fa5d209b58c2b4751d9887e547e2e100bf4 100644 (file)
--- a/MdePkg/Library/BaseLib/String.c
+++ b/MdePkg/Library/BaseLib/String.c
@@ -155,8 +155,8 @@ StrLen (
     // If PcdMaximumUnicodeStringLength is not zero,\r
     // length should not more than PcdMaximumUnicodeStringLength\r
     //\r
     // If PcdMaximumUnicodeStringLength is not zero,\r
     // length should not more than PcdMaximumUnicodeStringLength\r
     //\r

-    if (FixedPcdGet32 (PcdMaximumUnicodeStringLength) != 0) {\r
-      ASSERT (Length < FixedPcdGet32 (PcdMaximumUnicodeStringLength));\r
+    if (PcdGet32 (PcdMaximumUnicodeStringLength) != 0) {\r
+      ASSERT (Length < PcdGet32 (PcdMaximumUnicodeStringLength));\r

     }\r
   }\r
   return Length;\r
     }\r
   }\r
   return Length;\r


@@ -520,8 +520,8 @@ AsciiStrLen (
     // If PcdMaximumUnicodeStringLength is not zero,\r
     // length should not more than PcdMaximumUnicodeStringLength\r
     //\r
     // If PcdMaximumUnicodeStringLength is not zero,\r
     // length should not more than PcdMaximumUnicodeStringLength\r
     //\r

-    if (FixedPcdGet32 (PcdMaximumAsciiStringLength) != 0) {\r
-      ASSERT (Length < FixedPcdGet32 (PcdMaximumAsciiStringLength));\r
+    if (PcdGet32 (PcdMaximumAsciiStringLength) != 0) {\r
+      ASSERT (Length < PcdGet32 (PcdMaximumAsciiStringLength));\r

     }\r
   }\r
   return Length;\r
     }\r
   }\r
   return Length;\r

diff --git a/MdePkg/Library/BaseLib/Synchronization.c b/MdePkg/Library/BaseLib/Synchronization.c
index 4c4734523d4a88f665499f8a6d634a61f8c3d37f..0d51956d748f6dda9f46cd0ee43b083352c74e78 100644 (file)
--- a/MdePkg/Library/BaseLib/Synchronization.c
+++ b/MdePkg/Library/BaseLib/Synchronization.c
@@ -131,12 +131,12 @@ AcquireSpinLock (
   Tick = 0;\r
   Start = 0;\r
   End = 0;\r
   Tick = 0;\r
   Start = 0;\r
   End = 0;\r

-  if (FixedPcdGet32 (PcdSpinLockTimeout) > 0) {\r
+  if (PcdGet32 (PcdSpinLockTimeout) > 0) {\r

     Tick = GetPerformanceCounter ();\r
     Timeout = DivU64x32 (\r
                 MultU64x32 (\r
                   GetPerformanceCounterProperties (&Start, &End),\r
     Tick = GetPerformanceCounter ();\r
     Timeout = DivU64x32 (\r
                 MultU64x32 (\r
                   GetPerformanceCounterProperties (&Start, &End),\r

-                  FixedPcdGet32 (PcdSpinLockTimeout)\r
+                  PcdGet32 (PcdSpinLockTimeout)\r

                   ),\r
                 1000000\r
                 );\r
                   ),\r
                 1000000\r
                 );\r