diff options
| author | klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-06-22 14:07:22 +0000 |
|---|---|---|
| committer | klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-06-22 14:07:22 +0000 |
| commit | dc530c7b9df56725243aae875ed90ac1138e4628 (patch) | |
| tree | 033c55927f95fb0e3c3eeb98e3a647a32e3695b0 /MdePkg | |
| parent | 30a60d29aac19ca429dc75b6295db907618513b4 (diff) | |
| download | edk2-dc530c7b9df56725243aae875ed90ac1138e4628.zip edk2-dc530c7b9df56725243aae875ed90ac1138e4628.tar.gz edk2-dc530c7b9df56725243aae875ed90ac1138e4628.tar.bz2 | |
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
Diffstat (limited to 'MdePkg')
| -rw-r--r-- | MdePkg/Include/Library/PcdLib.h | 14 | ||||
| -rw-r--r-- | MdePkg/Library/BaseLib/LinkedList.c | 4 | ||||
| -rw-r--r-- | MdePkg/Library/BaseLib/String.c | 8 | ||||
| -rw-r--r-- | MdePkg/Library/BaseLib/Synchronization.c | 4 |
4 files changed, 15 insertions, 15 deletions
diff --git a/MdePkg/Include/Library/PcdLib.h b/MdePkg/Include/Library/PcdLib.h index c4e5502..b513a61 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 9ad1b08..be7e0a6 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 0483fc7..c4330fa 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 4c47345..0d51956 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
);
|