diff options
Diffstat (limited to 'MdeModulePkg/Universal/PCD/Pei')
| -rw-r--r-- | MdeModulePkg/Universal/PCD/Pei/Pcd.c | 21 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/PCD/Pei/Pcd.inf | 8 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/PCD/Pei/Service.c | 11 |
3 files changed, 9 insertions, 31 deletions
diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c index 41b34269a0..ecbdc94662 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c +++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c @@ -260,15 +260,6 @@ PeiPcdGetSize ( UINTN Size;
UINTN MaxSize;
- //
- // If DebugAssertEnabled is TRUE, we still need to provide the GET size
- // function as GetWorker and SetWoker need this function to do ASSERT.
- //
- if ((!FeaturePcdGet(PcdPeiPcdDatabaseGetSizeEnabled)) &&
- (!DebugAssertEnabled ())) {
- return 0;
- }
-
PeiPcdDb = GetPcdDatabase ();
//
// TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.
@@ -458,10 +449,6 @@ PeiPcdGetSizeEx ( IN UINTN ExTokenNumber
)
{
- if ((!FeaturePcdGet (PcdPeiPcdDatabaseGetSizeEnabled)) || !FeaturePcdGet (PcdPeiPcdDatabaseExEnabled)) {
- return 0;
- }
-
return PeiPcdGetSize (GetExPcdTokenNumber (Guid, ExTokenNumber));
}
@@ -831,7 +818,7 @@ PeiRegisterCallBackOnSet ( IN PCD_PPI_CALLBACK CallBackFunction
)
{
- if (!FeaturePcdGet(PcdPeiPcdDatabaseCallbackOnSetEnabled)) {
+ if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {
return EFI_UNSUPPORTED;
}
@@ -862,7 +849,7 @@ PcdUnRegisterCallBackOnSet ( IN PCD_PPI_CALLBACK CallBackFunction
)
{
- if (!FeaturePcdGet(PcdPeiPcdDatabaseCallbackOnSetEnabled)) {
+ if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {
return EFI_UNSUPPORTED;
}
@@ -906,7 +893,7 @@ PeiPcdGetNextToken ( BOOLEAN Found;
BOOLEAN PeiExMapTableEmpty;
- if (!FeaturePcdGet (PcdPeiPcdDatabaseTraverseEnabled)) {
+ if (!FeaturePcdGet (PcdPeiFullPcdDatabaseEnable)) {
return EFI_UNSUPPORTED;
}
@@ -1023,7 +1010,7 @@ PeiPcdGetNextTokenSpace ( BOOLEAN Found;
BOOLEAN PeiExMapTableEmpty;
- if (!FeaturePcdGet (PcdPeiPcdDatabaseTraverseEnabled)) {
+ if (!FeaturePcdGet (PcdPeiFullPcdDatabaseEnable)) {
return EFI_UNSUPPORTED;
}
diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf index c00cbbeddf..91c38127fd 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf +++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf @@ -55,15 +55,11 @@ gPcdPpiGuid ## PRODUCES
[FeaturePcd.common]
- gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled
- gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseExEnabled
- gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseCallbackOnSetEnabled
- gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled
- gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseTraverseEnabled
+ gEfiMdeModulePkgTokenSpaceGuid.PcdPeiFullPcdDatabaseEnable
[FixedPcd.common]
gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress
- gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry || PcdPeiPcdDatabaseCallbackOnSetEnabled
+ gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry || PcdPeiFullPcdDatabaseEnable
[Depex]
TRUE
diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c index 10cc228433..5bc1dc8205 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Service.c +++ b/MdeModulePkg/Universal/PCD/Pei/Service.c @@ -360,7 +360,7 @@ SetWorker ( VOID *InternalData;
UINTN MaxSize;
- if (!FeaturePcdGet(PcdPeiPcdDatabaseSetEnabled)) {
+ if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {
return EFI_UNSUPPORTED;
}
@@ -514,7 +514,7 @@ ExSetWorker ( {
UINTN TokenNumber;
- if (!FeaturePcdGet(PcdPeiPcdDatabaseSetEnabled)) {
+ if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {
return EFI_UNSUPPORTED;
}
@@ -542,12 +542,7 @@ ExGetWorker ( IN UINTN ExTokenNumber,
IN UINTN GetSize
)
-{
- if (!FeaturePcdGet (PcdPeiPcdDatabaseExEnabled)) {
- ASSERT (FALSE);
- return 0;
- }
-
+{
return GetWorker (GetExPcdTokenNumber (Guid, ExTokenNumber), GetSize);
}
|