Use single one PcdFrameworkCompatibilitySupport PCD to support framework HII and...

[mirror_edk2.git] / MdeModulePkg / Universal / PCD / Pei / Pcd.c

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
index 41b34269a09d346efae447175535d59cc13aa282..ecbdc946622eb92063117ddd2b00b9aec423d9d0 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
@@ -260,15 +260,6 @@ PeiPcdGetSize (
   UINTN               Size;\r
   UINTN               MaxSize;\r
 \r
-  //\r
-  // If DebugAssertEnabled is TRUE, we still need to provide the GET size\r
-  // function as GetWorker and SetWoker need this function to do ASSERT.\r
-  //\r
-  if ((!FeaturePcdGet(PcdPeiPcdDatabaseGetSizeEnabled)) &&\r
-      (!DebugAssertEnabled ())) {\r
-    return 0;\r
-  }\r
-\r
   PeiPcdDb = GetPcdDatabase ();\r
   //\r
   // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.\r
@@ -458,10 +449,6 @@ PeiPcdGetSizeEx (
   IN UINTN                        ExTokenNumber\r
   )\r
 {\r
-  if ((!FeaturePcdGet (PcdPeiPcdDatabaseGetSizeEnabled)) ||  !FeaturePcdGet (PcdPeiPcdDatabaseExEnabled)) {\r
-    return 0;\r
-  }\r
-\r
   return PeiPcdGetSize (GetExPcdTokenNumber (Guid, ExTokenNumber));\r
 }\r
 \r
@@ -831,7 +818,7 @@ PeiRegisterCallBackOnSet (
   IN  PCD_PPI_CALLBACK            CallBackFunction\r
   )\r
 {\r
-  if (!FeaturePcdGet(PcdPeiPcdDatabaseCallbackOnSetEnabled)) {\r
+  if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -862,7 +849,7 @@ PcdUnRegisterCallBackOnSet (
   IN  PCD_PPI_CALLBACK            CallBackFunction\r
   )\r
 {\r
-  if (!FeaturePcdGet(PcdPeiPcdDatabaseCallbackOnSetEnabled)) {\r
+  if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -906,7 +893,7 @@ PeiPcdGetNextToken (
   BOOLEAN             Found;\r
   BOOLEAN             PeiExMapTableEmpty;\r
 \r
-  if (!FeaturePcdGet (PcdPeiPcdDatabaseTraverseEnabled)) {\r
+  if (!FeaturePcdGet (PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -1023,7 +1010,7 @@ PeiPcdGetNextTokenSpace (
   BOOLEAN             Found;\r
   BOOLEAN             PeiExMapTableEmpty;\r
 \r
-  if (!FeaturePcdGet (PcdPeiPcdDatabaseTraverseEnabled)) {\r
+  if (!FeaturePcdGet (PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r