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 ddf3a641951543dee83e0790a962cdff4c6d5cfa..ecbdc946622eb92063117ddd2b00b9aec423d9d0 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
@@ -1,5 +1,5 @@
 /** @file \r
-PCD PEIM produces PCD database to manage all dynamic PCD in PEI phase and install Pcd Ppi.\r
+  All Pcd Ppi services are implemented here.\r
   \r
 Copyright (c) 2006 - 2008, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
@@ -205,7 +205,7 @@ PeiPcdGet64 (
 \r
   @param[in]  TokenNumber The PCD token number. \r
 \r
-  @return The pointer to the buffer to be retrived.\r
+  @return The pointer to the buffer to be retrieved.\r
   \r
 **/\r
 VOID *\r
@@ -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
@@ -402,7 +393,7 @@ PeiPcdGet64Ex (
   @param[in]  Guid          The token space for the token number.\r
   @param[in]  ExTokenNumber The PCD token number. \r
 \r
-  @return The pointer to the buffer to be retrived.\r
+  @return The pointer to the buffer to be retrieved.\r
   \r
 **/\r
 VOID *\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,12 +818,14 @@ PeiRegisterCallBackOnSet (
   IN  PCD_PPI_CALLBACK            CallBackFunction\r
   )\r
 {\r
-  if (!FeaturePcdGet(PcdPeiPcdDatabaseCallbackOnSetEnabled)) {\r
+  if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  ASSERT (CallBackFunction != NULL);\r
-  \r
+  if (CallBackFunction == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+\r
   return PeiRegisterCallBackWorker (ExTokenNumber, Guid, CallBackFunction, TRUE);\r
 }\r
 \r
@@ -860,12 +849,14 @@ PcdUnRegisterCallBackOnSet (
   IN  PCD_PPI_CALLBACK            CallBackFunction\r
   )\r
 {\r
-  if (!FeaturePcdGet(PcdPeiPcdDatabaseCallbackOnSetEnabled)) {\r
+  if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  ASSERT (CallBackFunction != NULL);\r
-  \r
+  if (CallBackFunction == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+\r
   return PeiRegisterCallBackWorker (ExTokenNumber, Guid, CallBackFunction, FALSE);\r
 }\r
 \r
@@ -902,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
@@ -1019,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
@@ -1091,7 +1082,7 @@ PeiPcdGetNextTokenSpace (
   The max size of this PCD's value is described in PCD's definition in DEC file.\r
 \r
   @param LocalTokenNumberTableIdx Index of PCD token number in PCD token table\r
-  @param MaxSize                  Maxmium size of PCD's value\r
+  @param MaxSize                  Maximum size of PCD's value\r
   @param Database                 Pcd database in PEI phase.\r
 \r
   @return PCD value's size for POINTER type PCD.\r
@@ -1162,11 +1153,11 @@ GetPtrTypeSize (
   The max size of this PCD's value is described in PCD's definition in DEC file.\r
 \r
   @param LocalTokenNumberTableIdx Index of PCD token number in PCD token table\r
-  @param CurrentSize              Maxmium size of PCD's value\r
+  @param CurrentSize              Maximum size of PCD's value\r
   @param Database                 Pcd database in PEI phase.\r
 \r
-  @retval TRUE  Success to set PCD's value size, which is not exceed maxmium size\r
-  @retval FALSE Fail to set PCD's value size, which maybe exceed maxmium size\r
+  @retval TRUE  Success to set PCD's value size, which is not exceed maximum size\r
+  @retval FALSE Fail to set PCD's value size, which maybe exceed maximum size\r
 \r
 **/\r
 BOOLEAN\r
@@ -1207,7 +1198,7 @@ SetPtrTypeSize (
       (*CurrentSize == MAX_ADDRESS)) {\r
        *CurrentSize = MaxSize;\r
        return FALSE;\r
-    } \r
+    }\r
     \r
     if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == 0) {\r
       //\r