MdePkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / MdePkg / Library / PeiPcdLib / PeiPcdLib.c

diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
index 2e2dbb6ac51c59603c0926a3696a4f0b819d3730..916a2c0844ebf828e3f0362233e25ea18ec54b32 100644 (file)
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
@@ -1,14 +1,8 @@
 /** @file\r
 Implementation of PcdLib class library for PEI phase.\r
 \r
 /** @file\r
 Implementation of PcdLib class library for PEI phase.\r
 \r

-Copyright (c) 2006 - 2008, Intel Corporation<BR>\r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r

 \r
 \r
 **/\r
 \r
 \r
 **/\r


@@ -19,6 +13,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <PiPei.h>\r
 \r
 #include <Ppi/Pcd.h>\r
 #include <PiPei.h>\r
 \r
 #include <Ppi/Pcd.h>\r

+#include <Ppi/PiPcd.h>\r
+#include <Ppi/PcdInfo.h>\r
+#include <Ppi/PiPcdInfo.h>\r

 \r
 #include <Library/PeiServicesLib.h>\r
 #include <Library/PcdLib.h>\r
 \r
 #include <Library/PeiServicesLib.h>\r
 #include <Library/PcdLib.h>\r


@@ -28,34 +25,102 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**\r
   Retrieve the PCD_PPI pointer.\r
 \r
 /**\r
   Retrieve the PCD_PPI pointer.\r
 \r

-  This function is to locate PCD_PPI PPI via PeiService. \r
+  This function is to locate PCD_PPI PPI via PeiService.\r

   If fail to locate PCD_PPI, then ASSERT_EFI_ERROR().\r
   If fail to locate PCD_PPI, then ASSERT_EFI_ERROR().\r

-  \r
+\r

   @retval PCD_PPI * The pointer to the PCD_PPI.\r
 \r
 **/\r
 PCD_PPI  *\r
 GetPcdPpiPointer (\r
   VOID\r
   @retval PCD_PPI * The pointer to the PCD_PPI.\r
 \r
 **/\r
 PCD_PPI  *\r
 GetPcdPpiPointer (\r
   VOID\r

-  ) \r
+  )\r

 {\r
   EFI_STATUS        Status;\r
   PCD_PPI           *PcdPpi;\r
 {\r
   EFI_STATUS        Status;\r
   PCD_PPI           *PcdPpi;\r

-  \r
+\r

   Status = PeiServicesLocatePpi (&gPcdPpiGuid, 0, NULL, (VOID **)&PcdPpi);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return PcdPpi;\r
 }\r
 \r
   Status = PeiServicesLocatePpi (&gPcdPpiGuid, 0, NULL, (VOID **)&PcdPpi);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return PcdPpi;\r
 }\r
 \r

+/**\r
+  Retrieve the pointer of EFI_PEI_PCD_PPI defined in PI 1.2 Vol 3.\r
+\r
+  This function is to locate EFI_PEI_PCD_PPI PPI via PeiService.\r
+  If fail to locate EFI_PEI_PCD_PPI, then ASSERT_EFI_ERROR().\r
+\r
+  @retval EFI_PEI_PCD_PPI * The pointer to the EFI_PEI_PCD_PPI.\r
+\r
+**/\r
+EFI_PEI_PCD_PPI *\r
+GetPiPcdPpiPointer (\r
+  VOID\r
+  )\r
+{\r
+  EFI_STATUS        Status;\r
+  EFI_PEI_PCD_PPI   *PiPcdPpi;\r
+\r
+  Status = PeiServicesLocatePpi (&gEfiPeiPcdPpiGuid, 0, NULL, (VOID **)&PiPcdPpi);\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+  return PiPcdPpi;\r
+}\r
+\r
+/**\r
+  Retrieve the GET_PCD_INFO_PPI pointer.\r
+\r
+  This function is to locate GET_PCD_INFO_PPI PPI via PeiService.\r
+  If fail to locate GET_PCD_INFO_PPI, then ASSERT_EFI_ERROR().\r
+\r
+  @retval GET_PCD_INFO_PPI * The pointer to the GET_PCD_INFO_PPI.\r
+\r
+**/\r
+GET_PCD_INFO_PPI *\r
+GetPcdInfoPpiPointer (\r
+  VOID\r
+  )\r
+{\r
+  EFI_STATUS            Status;\r
+  GET_PCD_INFO_PPI      *PcdInfoPpi;\r
+\r
+  Status = PeiServicesLocatePpi (&gGetPcdInfoPpiGuid, 0, NULL, (VOID **)&PcdInfoPpi);\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+  return PcdInfoPpi;\r
+}\r
+\r
+/**\r
+  Retrieve the pointer of EFI_GET_PCD_INFO_PPI defined in PI 1.2.1 Vol 3.\r
+\r
+  This function is to locate EFI_GET_PCD_INFO_PPI PPI via PeiService.\r
+  If fail to locate EFI_GET_PCD_INFO_PPI, then ASSERT_EFI_ERROR().\r
+\r
+  @retval EFI_GET_PCD_INFO_PPI * The pointer to the EFI_GET_PCD_INFO_PPI.\r
+\r
+**/\r
+EFI_GET_PCD_INFO_PPI *\r
+GetPiPcdInfoPpiPointer (\r
+  VOID\r
+  )\r
+{\r
+  EFI_STATUS            Status;\r
+  EFI_GET_PCD_INFO_PPI  *PiPcdInfoPpi;\r
+\r
+  Status = PeiServicesLocatePpi (&gEfiGetPcdInfoPpiGuid, 0, NULL, (VOID **)&PiPcdInfoPpi);\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+  return PiPcdInfoPpi;\r
+}\r
+\r

 /**\r
   This function provides a means by which SKU support can be established in the PCD infrastructure.\r
 \r
   Sets the current SKU in the PCD database to the value specified by SkuId.  SkuId is returned.\r
 /**\r
   This function provides a means by which SKU support can be established in the PCD infrastructure.\r
 \r
   Sets the current SKU in the PCD database to the value specified by SkuId.  SkuId is returned.\r

-  If SkuId >= PCD_MAX_SKU_ID, then ASSERT(). \r

 \r
 \r

-  @param  SkuId   The SKU value that will be used when the PCD service retrieves and sets values\r
-                  associated with a PCD token.\r
+  @param  SkuId   The SKU value that will be used when the PCD service retrieves\r
+                  and sets values associated with a PCD token.\r

 \r
   @return  Return the SKU ID that just be set.\r
 \r
 \r
   @return  Return the SKU ID that just be set.\r
 \r


@@ -66,10 +131,7 @@ LibPcdSetSku (
   IN UINTN   SkuId\r
   )\r
 {\r
   IN UINTN   SkuId\r
   )\r
 {\r

-\r
-  ASSERT (SkuId < PCD_MAX_SKU_ID);\r
-\r
-  GetPcdPpiPointer()->SetSku (SkuId);\r
+  GetPiPcdPpiPointer()->SetSku (SkuId);\r

 \r
   return SkuId;\r
 }\r
 \r
   return SkuId;\r
 }\r


@@ -78,12 +140,12 @@ LibPcdSetSku (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the 8-bit value for the token specified by TokenNumber. \r
+\r
+  Returns the 8-bit value for the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the 8-bit value for the token specified by TokenNumber. \r
+  @return Returns the 8-bit value for the token specified by TokenNumber.\r

 \r
 **/\r
 UINT8\r
 \r
 **/\r
 UINT8\r


@@ -99,12 +161,12 @@ LibPcdGet8 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the 16-bit value for the token specified by TokenNumber. \r
+\r
+  Returns the 16-bit value for the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the 16-bit value for the token specified by TokenNumber. \r
+  @return Returns the 16-bit value for the token specified by TokenNumber.\r

 \r
 **/\r
 UINT16\r
 \r
 **/\r
 UINT16\r


@@ -120,8 +182,8 @@ LibPcdGet16 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the 32-bit value for the token specified by TokenNumber. \r
+\r
+  Returns the 32-bit value for the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r


@@ -141,7 +203,7 @@ LibPcdGet32 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the 64-bit value for the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
   Returns the 64-bit value for the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r


@@ -162,7 +224,7 @@ LibPcdGet64 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the pointer to the buffer of the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
   Returns the pointer to the buffer of the token specified by TokenNumber.\r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r


@@ -183,15 +245,15 @@ LibPcdGetPtr (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the Boolean value of the token specified by TokenNumber. \r
+\r
+  Returns the Boolean value of the token specified by TokenNumber.\r

 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the Boolean value of the token specified by TokenNumber. \r
+  @return Returns the Boolean value of the token specified by TokenNumber.\r

 \r
 **/\r
 \r
 **/\r

-BOOLEAN \r
+BOOLEAN\r

 EFIAPI\r
 LibPcdGetBool (\r
   IN UINTN             TokenNumber\r
 EFIAPI\r
 LibPcdGetBool (\r
   IN UINTN             TokenNumber\r


@@ -207,7 +269,7 @@ LibPcdGetBool (
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r
 \r
   @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
 \r

-  @return Returns the size of the token specified by TokenNumber. \r
+  @return Returns the size of the token specified by TokenNumber.\r

 \r
 **/\r
 UINTN\r
 \r
 **/\r
 UINTN\r


@@ -223,12 +285,12 @@ LibPcdGetSize (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the 8-bit value for the token specified by TokenNumber and Guid.\r
   Returns the 8-bit value for the token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid         Pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid         The pointer to a 128-bit unique value that designates\r

                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r
                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r


@@ -244,7 +306,7 @@ LibPcdGetEx8 (
 {\r
   ASSERT (Guid != NULL);\r
 \r
 {\r
   ASSERT (Guid != NULL);\r
 \r

-  return (GetPcdPpiPointer ())->Get8Ex (Guid, TokenNumber);\r
+  return (GetPiPcdPpiPointer ())->Get8 (Guid, TokenNumber);\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -253,10 +315,10 @@ LibPcdGetEx8 (
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
   Returns the 16-bit value for the token specified by TokenNumber and Guid.\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
   Returns the 16-bit value for the token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid         Pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid         The pointer to a 128-bit unique value that designates\r

                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r
                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r


@@ -273,16 +335,16 @@ LibPcdGetEx16 (
 \r
   ASSERT (Guid != NULL);\r
 \r
 \r
   ASSERT (Guid != NULL);\r
 \r

-  return (GetPcdPpiPointer ())->Get16Ex (Guid, TokenNumber);\r
+  return (GetPiPcdPpiPointer ())->Get16 (Guid, TokenNumber);\r

 }\r
 \r
 \r
 \r
 /**\r
   Returns the 32-bit value for the token specified by TokenNumber and Guid.\r
 }\r
 \r
 \r
 \r
 /**\r
   Returns the 32-bit value for the token specified by TokenNumber and Guid.\r

-  If Guid is NULL, then ASSERT(). \r
+  If Guid is NULL, then ASSERT().\r

 \r
 \r

-  @param[in]  Guid         Pointer to a 128-bit unique value that designates \r
+  @param[in]  Guid         The pointer to a 128-bit unique value that designates\r

                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r
                            which namespace to retrieve a value from.\r
   @param[in]  TokenNumber  The PCD token number to retrieve a current value for.\r
 \r


@@ -298,7 +360,7 @@ LibPcdGetEx32 (
 {\r
   ASSERT (Guid != NULL);\r
 \r
 {\r
   ASSERT (Guid != NULL);\r
 \r

-  return (GetPcdPpiPointer ())->Get32Ex (Guid, TokenNumber);\r
+  return (GetPiPcdPpiPointer ())->Get32 (Guid, TokenNumber);\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -306,12 +368,12 @@ LibPcdGetEx32 (
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the 64-bit value for the token specified by TokenNumber and Guid.\r
   Returns the 64-bit value for the token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          Pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -326,19 +388,19 @@ LibPcdGetEx64 (
   )\r
 {\r
   ASSERT (Guid != NULL);\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r

-  return (GetPcdPpiPointer ())->Get64Ex (Guid, TokenNumber);\r
+  return (GetPiPcdPpiPointer ())->Get64 (Guid, TokenNumber);\r

 }\r
 \r
 \r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 }\r
 \r
 \r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
+\r

   Returns the pointer to the buffer of token specified by TokenNumber and Guid.\r
   Returns the pointer to the buffer of token specified by TokenNumber and Guid.\r

-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          Pointer to a 128-bit unique value that designates \r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -354,19 +416,19 @@ LibPcdGetExPtr (
 {\r
   ASSERT (Guid != NULL);\r
 \r
 {\r
   ASSERT (Guid != NULL);\r
 \r

-  return (GetPcdPpiPointer ())->GetPtrEx (Guid, TokenNumber);\r
+  return (GetPiPcdPpiPointer ())->GetPtr (Guid, TokenNumber);\r

 }\r
 \r
 \r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r
 }\r
 \r
 \r
 \r
 /**\r
   This function provides a means by which to retrieve a value for a given PCD token.\r

-  \r
-  Returns the Boolean value of the token specified by TokenNumber and Guid. \r
-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          Pointer to a 128-bit unique value that designates \r
+  Returns the Boolean value of the token specified by TokenNumber and Guid.\r
+\r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -381,19 +443,19 @@ LibPcdGetExBool (
   )\r
 {\r
   ASSERT (Guid != NULL);\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r

-  return (GetPcdPpiPointer ())->GetBoolEx (Guid, TokenNumber);\r
+  return (GetPiPcdPpiPointer ())->GetBool (Guid, TokenNumber);\r

 }\r
 \r
 \r
 \r
 /**\r
   This function provides a means by which to retrieve the size of a given PCD token.\r
 }\r
 \r
 \r
 \r
 /**\r
   This function provides a means by which to retrieve the size of a given PCD token.\r

-  \r
-  Returns the size of the token specified by TokenNumber and Guid. \r
-  \r
-  If Guid is NULL, then ASSERT(). \r

 \r
 \r

-  @param[in]  Guid          Pointer to a 128-bit unique value that designates \r
+  Returns the size of the token specified by TokenNumber and Guid.\r
+\r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that designates\r

                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r
                             which namespace to retrieve a value from.\r
   @param[in]  TokenNumber   The PCD token number to retrieve a current value for.\r
 \r


@@ -408,21 +470,22 @@ LibPcdGetExSize (
   )\r
 {\r
   ASSERT (Guid != NULL);\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r

-  return (GetPcdPpiPointer ())->GetSizeEx (Guid, TokenNumber);\r
+  return (GetPiPcdPpiPointer ())->GetSize (Guid, TokenNumber);\r

 }\r
 \r
 \r
 \r
 }\r
 \r
 \r
 \r

+#ifndef DISABLE_NEW_DEPRECATED_INTERFACES\r

 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 8-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 8-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
   to the value specified by Value.  Value is returned.\r

-  \r
+\r

   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 8-bit value to set.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 8-bit value to set.\r
 \r

-  @return Return the value been set.\r
+  @return Return the value that was set.\r

 \r
 **/\r
 UINT8\r
 \r
 **/\r
 UINT8\r


@@ -432,12 +495,8 @@ LibPcdSet8 (
   IN UINT8             Value\r
   )\r
 {\r
   IN UINT8             Value\r
   )\r
 {\r

-  EFI_STATUS Status;\r
+  (GetPcdPpiPointer ())->Set8 (TokenNumber, Value);\r

 \r
 \r

-  Status = (GetPcdPpiPointer ())->Set8 (TokenNumber, Value);\r
-\r
-  ASSERT_EFI_ERROR (Status);\r
-  \r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r


@@ -445,14 +504,14 @@ LibPcdSet8 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 16-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 16-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
   to the value specified by Value.  Value is returned.\r

-  \r
+\r

   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 16-bit value to set.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 16-bit value to set.\r
 \r

-  @return Return the value been set.\r
+  @return Return the value that was set.\r

 \r
 **/\r
 UINT16\r
 \r
 **/\r
 UINT16\r


@@ -462,12 +521,8 @@ LibPcdSet16 (
   IN UINT16            Value\r
   )\r
 {\r
   IN UINT16            Value\r
   )\r
 {\r

-  EFI_STATUS Status;\r
-\r
-  Status = (GetPcdPpiPointer ())->Set16 (TokenNumber, Value);\r
+  (GetPcdPpiPointer ())->Set16 (TokenNumber, Value);\r

 \r
 \r

-  ASSERT_EFI_ERROR (Status);\r
-  \r

   return Value;\r
 }\r
 \r
   return Value;\r
 }\r
 \r


@@ -475,14 +530,14 @@ LibPcdSet16 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 32-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 32-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
   to the value specified by Value.  Value is returned.\r

-  \r
+\r

   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 32-bit value to set.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 32-bit value to set.\r
 \r

-  @return Return the value been set.\r
+  @return Return the value that was set.\r

 \r
 **/\r
 UINT32\r
 \r
 **/\r
 UINT32\r


@@ -492,11 +547,7 @@ LibPcdSet32 (
   IN UINT32            Value\r
   )\r
 {\r
   IN UINT32            Value\r
   )\r
 {\r

-  EFI_STATUS Status;\r
-\r
-  Status = (GetPcdPpiPointer ())->Set32 (TokenNumber, Value);\r
-\r
-  ASSERT_EFI_ERROR (Status);\r
+  (GetPcdPpiPointer ())->Set32 (TokenNumber, Value);\r

 \r
   return Value;\r
 }\r
 \r
   return Value;\r
 }\r


@@ -505,14 +556,14 @@ LibPcdSet32 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 64-bit value for the token specified by TokenNumber \r
+\r
+  Sets the 64-bit value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
   to the value specified by Value.  Value is returned.\r

-  \r
+\r

   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 64-bit value to set.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 64-bit value to set.\r
 \r

-  @return Return the value been set.\r
+  @return Return the value that was set.\r

 \r
 **/\r
 UINT64\r
 \r
 **/\r
 UINT64\r


@@ -522,11 +573,7 @@ LibPcdSet64 (
   IN UINT64            Value\r
   )\r
 {\r
   IN UINT64            Value\r
   )\r
 {\r

-  EFI_STATUS Status;\r
-\r
-  Status = (GetPcdPpiPointer ())->Set64 (TokenNumber, Value);\r
-\r
-  ASSERT_EFI_ERROR (Status);\r
+  (GetPcdPpiPointer ())->Set64 (TokenNumber, Value);\r

 \r
   return Value;\r
 }\r
 \r
   return Value;\r
 }\r


@@ -535,19 +582,19 @@ LibPcdSet64 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets a buffer for the token specified by TokenNumber to the value \r
-  specified by Buffer and SizeOfBuffer.  Buffer is returned.  \r
-  If SizeOfBuffer is greater than the maximum size support by TokenNumber, \r
-  then set SizeOfBuffer to the maximum size supported by TokenNumber and \r
-  return NULL to indicate that the set operation was not actually performed.  \r
-\r
-  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to the \r
+\r
+  Sets a buffer for the token specified by TokenNumber to the value\r
+  specified by Buffer and SizeOfBuffer.  Buffer is returned.\r
+  If SizeOfBuffer is greater than the maximum size support by TokenNumber,\r
+  then set SizeOfBuffer to the maximum size supported by TokenNumber and\r
+  return NULL to indicate that the set operation was not actually performed.\r
+\r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to the\r

   maximum size supported by TokenName and NULL must be returned.\r
   maximum size supported by TokenName and NULL must be returned.\r

-  \r
+\r

   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r

-  \r
+\r

   @param[in]      TokenNumber   The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
   @param[in]      Buffer        A pointer to the buffer to set.\r
   @param[in]      TokenNumber   The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
   @param[in]      Buffer        A pointer to the buffer to set.\r


@@ -564,16 +611,17 @@ LibPcdSetPtr (
   )\r
 {\r
   EFI_STATUS Status;\r
   )\r
 {\r
   EFI_STATUS Status;\r

+  UINTN      InputSizeOfBuffer;\r

 \r
   ASSERT (SizeOfBuffer != NULL);\r
 \r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
 \r
   ASSERT (SizeOfBuffer != NULL);\r
 \r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r

-  \r
-  Status = (GetPcdPpiPointer ())->SetPtr (TokenNumber, SizeOfBuffer, (VOID *) Buffer);\r

 \r
 \r

-  if (EFI_ERROR (Status)) {\r
+  InputSizeOfBuffer = *SizeOfBuffer;\r
+  Status = (GetPcdPpiPointer ())->SetPtr (TokenNumber, SizeOfBuffer, (VOID *) Buffer);\r
+  if (EFI_ERROR (Status) && (*SizeOfBuffer < InputSizeOfBuffer)) {\r

     return NULL;\r
   }\r
 \r
     return NULL;\r
   }\r
 \r


@@ -584,14 +632,14 @@ LibPcdSetPtr (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the Boolean value for the token specified by TokenNumber \r
+\r
+  Sets the Boolean value for the token specified by TokenNumber\r

   to the value specified by Value.  Value is returned.\r
   to the value specified by Value.  Value is returned.\r

-  \r
+\r

   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The boolean value to set.\r
 \r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The boolean value to set.\r
 \r

-  @return Return the value been set.\r
+  @return Return the value that was set.\r

 \r
 **/\r
 BOOLEAN\r
 \r
 **/\r
 BOOLEAN\r


@@ -601,11 +649,7 @@ LibPcdSetBool (
   IN BOOLEAN           Value\r
   )\r
 {\r
   IN BOOLEAN           Value\r
   )\r
 {\r

-  EFI_STATUS Status;\r
-\r
-  Status = (GetPcdPpiPointer ())->SetBool (TokenNumber, Value);\r
-\r
-  ASSERT_EFI_ERROR (Status);\r
+  (GetPcdPpiPointer ())->SetBool (TokenNumber, Value);\r

 \r
   return Value;\r
 }\r
 \r
   return Value;\r
 }\r


@@ -614,18 +658,18 @@ LibPcdSetBool (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 8-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 8-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
   Guid to the value specified by Value. Value is returned.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r

-  \r
-  @param[in]  Guid          Pointer to a 128-bit unique value that \r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 8-bit value to set.\r
 \r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 8-bit value to set.\r
 \r

-  @return Return the value been set.\r
+  @return Return the value that was set.\r

 \r
 **/\r
 UINT8\r
 \r
 **/\r
 UINT8\r


@@ -636,13 +680,9 @@ LibPcdSetEx8 (
   IN UINT8             Value\r
   )\r
 {\r
   IN UINT8             Value\r
   )\r
 {\r

-  EFI_STATUS Status;\r
-\r

   ASSERT (Guid != NULL);\r
 \r
   ASSERT (Guid != NULL);\r
 \r

-  Status = (GetPcdPpiPointer ())->Set8Ex (Guid, TokenNumber, Value);\r
-\r
-  ASSERT_EFI_ERROR (Status);\r
+  (GetPiPcdPpiPointer ())->Set8 (Guid, TokenNumber, Value);\r

 \r
   return Value;\r
 }\r
 \r
   return Value;\r
 }\r


@@ -651,18 +691,18 @@ LibPcdSetEx8 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 16-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 16-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
   Guid to the value specified by Value. Value is returned.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r

-  \r
-  @param[in]  Guid          Pointer to a 128-bit unique value that \r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 16-bit value to set.\r
 \r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 16-bit value to set.\r
 \r

-  @return Return the value been set.\r
+  @return Return the value that was set.\r

 \r
 **/\r
 UINT16\r
 \r
 **/\r
 UINT16\r


@@ -673,11 +713,9 @@ LibPcdSetEx16 (
   IN UINT16            Value\r
   )\r
 {\r
   IN UINT16            Value\r
   )\r
 {\r

-  EFI_STATUS Status;\r

   ASSERT (Guid != NULL);\r
   ASSERT (Guid != NULL);\r

-  Status = (GetPcdPpiPointer ())->Set16Ex (Guid, TokenNumber, Value);\r

 \r
 \r

-  ASSERT_EFI_ERROR (Status);\r
+  (GetPiPcdPpiPointer ())->Set16 (Guid, TokenNumber, Value);\r

 \r
   return Value;\r
 }\r
 \r
   return Value;\r
 }\r


@@ -686,18 +724,18 @@ LibPcdSetEx16 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 32-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 32-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
   Guid to the value specified by Value. Value is returned.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r

-  \r
-  @param[in]  Guid          Pointer to a 128-bit unique value that \r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 32-bit value to set.\r
 \r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 32-bit value to set.\r
 \r

-  @return Return the value been set.\r
+  @return Return the value that was set.\r

 \r
 **/\r
 UINT32\r
 \r
 **/\r
 UINT32\r


@@ -708,13 +746,9 @@ LibPcdSetEx32 (
   IN UINT32            Value\r
   )\r
 {\r
   IN UINT32            Value\r
   )\r
 {\r

-  EFI_STATUS Status;\r
-\r

   ASSERT (Guid != NULL);\r
 \r
   ASSERT (Guid != NULL);\r
 \r

-  Status = (GetPcdPpiPointer ())->Set32Ex (Guid, TokenNumber, Value);\r
-\r
-  ASSERT_EFI_ERROR (Status);\r
+  (GetPiPcdPpiPointer ())->Set32 (Guid, TokenNumber, Value);\r

 \r
   return Value;\r
 }\r
 \r
   return Value;\r
 }\r


@@ -723,17 +757,18 @@ LibPcdSetEx32 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the 64-bit value for the token specified by TokenNumber and \r
+\r
+  Sets the 64-bit value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
   Guid to the value specified by Value. Value is returned.\r

+\r

   If Guid is NULL, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r

-  \r
-  @param[in]  Guid          Pointer to a 128-bit unique value that \r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 64-bit value to set.\r
 \r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The 64-bit value to set.\r
 \r

-  @return Return the value been set.\r
+  @return Return the value that was set.\r

 \r
 **/\r
 UINT64\r
 \r
 **/\r
 UINT64\r


@@ -744,12 +779,9 @@ LibPcdSetEx64 (
   IN UINT64            Value\r
   )\r
 {\r
   IN UINT64            Value\r
   )\r
 {\r

-  EFI_STATUS Status;\r

   ASSERT (Guid != NULL);\r
 \r
   ASSERT (Guid != NULL);\r
 \r

-  Status = (GetPcdPpiPointer ())->Set64Ex (Guid, TokenNumber, Value);\r
-\r
-  ASSERT_EFI_ERROR (Status);\r
+  (GetPiPcdPpiPointer ())->Set64 (Guid, TokenNumber, Value);\r

 \r
   return Value;\r
 }\r
 \r
   return Value;\r
 }\r


@@ -758,18 +790,18 @@ LibPcdSetEx64 (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets a buffer for the token specified by TokenNumber to the value specified by \r
-  Buffer and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than \r
-  the maximum size support by TokenNumber, then set SizeOfBuffer to the maximum size \r
-  supported by TokenNumber and return NULL to indicate that the set operation \r
-  was not actually performed. \r
-  \r
+\r
+  Sets a buffer for the token specified by TokenNumber to the value specified by\r
+  Buffer and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than\r
+  the maximum size support by TokenNumber, then set SizeOfBuffer to the maximum size\r
+  supported by TokenNumber and return NULL to indicate that the set operation\r
+  was not actually performed.\r
+\r

   If Guid is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r

-  \r
-  @param[in]  Guid              Pointer to a 128-bit unique value that \r
+\r
+  @param[in]  Guid              The pointer to a 128-bit unique value that\r

                                 designates which namespace to set a value from.\r
   @param[in]  TokenNumber       The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
                                 designates which namespace to set a value from.\r
   @param[in]  TokenNumber       The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r


@@ -788,15 +820,17 @@ LibPcdSetExPtr (
   )\r
 {\r
   EFI_STATUS      Status;\r
   )\r
 {\r
   EFI_STATUS      Status;\r

+  UINTN           InputSizeOfBuffer;\r
+\r

   ASSERT (SizeOfBuffer != NULL);\r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
   ASSERT (Guid != NULL);\r
 \r
   ASSERT (SizeOfBuffer != NULL);\r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
   ASSERT (Guid != NULL);\r
 \r

-  Status = (GetPcdPpiPointer ())->SetPtrEx (Guid, TokenNumber, SizeOfBuffer, Buffer);\r
-\r
-  if (EFI_ERROR (Status)) {\r
+  InputSizeOfBuffer = *SizeOfBuffer;\r
+  Status = (GetPiPcdPpiPointer ())->SetPtr (Guid, TokenNumber, SizeOfBuffer, Buffer);\r
+  if (EFI_ERROR (Status) && (*SizeOfBuffer < InputSizeOfBuffer)) {\r

     return NULL;\r
   }\r
 \r
     return NULL;\r
   }\r
 \r


@@ -807,18 +841,18 @@ LibPcdSetExPtr (
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r
 \r
 /**\r
   This function provides a means by which to set a value for a given PCD token.\r

-  \r
-  Sets the Boolean value for the token specified by TokenNumber and \r
+\r
+  Sets the Boolean value for the token specified by TokenNumber and\r

   Guid to the value specified by Value. Value is returned.\r
   Guid to the value specified by Value. Value is returned.\r

-  \r
+\r

   If Guid is NULL, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r

-  \r
-  @param[in]  Guid          Pointer to a 128-bit unique value that \r
+\r
+  @param[in]  Guid          The pointer to a 128-bit unique value that\r

                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The Boolean value to set.\r
 \r
                             designates which namespace to set a value from.\r
   @param[in]  TokenNumber   The PCD token number to set a current value for.\r
   @param[in]  Value         The Boolean value to set.\r
 \r

-  @return Return the value been set.\r
+  @return Return the value that was set.\r

 \r
 **/\r
 BOOLEAN\r
 \r
 **/\r
 BOOLEAN\r


@@ -829,31 +863,363 @@ LibPcdSetExBool (
   IN BOOLEAN           Value\r
   )\r
 {\r
   IN BOOLEAN           Value\r
   )\r
 {\r

-  EFI_STATUS Status;\r
-\r

   ASSERT (Guid != NULL);\r
   ASSERT (Guid != NULL);\r

-  Status = (GetPcdPpiPointer ())->SetBoolEx (Guid, TokenNumber, Value);\r

 \r
 \r

-  ASSERT_EFI_ERROR (Status);\r
+  (GetPiPcdPpiPointer ())->SetBool (Guid, TokenNumber, Value);\r

 \r
   return Value;\r
 }\r
 \r
   return Value;\r
 }\r

+#endif\r
+\r
+/**\r
+  This function provides a means by which to set a value for a given PCD token.\r
+\r
+  Sets the 8-bit value for the token specified by TokenNumber\r
+  to the value specified by Value.\r
+\r
+  @param[in] TokenNumber    The PCD token number to set a current value for.\r
+  @param[in] Value          The 8-bit value to set.\r
+\r
+  @return The status of the set operation.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+LibPcdSet8S (\r
+  IN UINTN          TokenNumber,\r
+  IN UINT8          Value\r
+  )\r
+{\r
+  return (GetPcdPpiPointer ())->Set8 (TokenNumber, Value);\r
+}\r
+\r
+/**\r
+  This function provides a means by which to set a value for a given PCD token.\r
+\r
+  Sets the 16-bit value for the token specified by TokenNumber\r
+  to the value specified by Value.\r
+\r
+  @param[in] TokenNumber    The PCD token number to set a current value for.\r
+  @param[in] Value          The 16-bit value to set.\r
+\r
+  @return The status of the set operation.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+LibPcdSet16S (\r
+  IN UINTN          TokenNumber,\r
+  IN UINT16         Value\r
+  )\r
+{\r
+  return (GetPcdPpiPointer ())->Set16 (TokenNumber, Value);\r
+}\r
+\r
+/**\r
+  This function provides a means by which to set a value for a given PCD token.\r
+\r
+  Sets the 32-bit value for the token specified by TokenNumber\r
+  to the value specified by Value.\r
+\r
+  @param[in] TokenNumber    The PCD token number to set a current value for.\r
+  @param[in] Value          The 32-bit value to set.\r
+\r
+  @return The status of the set operation.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+LibPcdSet32S (\r
+  IN UINTN          TokenNumber,\r
+  IN UINT32         Value\r
+  )\r
+{\r
+  return (GetPcdPpiPointer ())->Set32 (TokenNumber, Value);\r
+}\r
+\r
+/**\r
+  This function provides a means by which to set a value for a given PCD token.\r
+\r
+  Sets the 64-bit value for the token specified by TokenNumber\r
+  to the value specified by Value.\r
+\r
+  @param[in] TokenNumber    The PCD token number to set a current value for.\r
+  @param[in] Value          The 64-bit value to set.\r
+\r
+  @return The status of the set operation.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+LibPcdSet64S (\r
+  IN UINTN          TokenNumber,\r
+  IN UINT64         Value\r
+  )\r
+{\r
+  return (GetPcdPpiPointer ())->Set64 (TokenNumber, Value);\r
+}\r
+\r
+/**\r
+  This function provides a means by which to set a value for a given PCD token.\r
+\r
+  Sets a buffer for the token specified by TokenNumber to the value specified\r
+  by Buffer and SizeOfBuffer. If SizeOfBuffer is greater than the maximum size\r
+  support by TokenNumber, then set SizeOfBuffer to the maximum size supported by\r
+  TokenNumber and return EFI_INVALID_PARAMETER to indicate that the set operation\r
+  was not actually performed.\r
+\r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to the\r
+  maximum size supported by TokenName and EFI_INVALID_PARAMETER must be returned.\r
+\r
+  If SizeOfBuffer is NULL, then ASSERT().\r
+  If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
+\r
+  @param[in]      TokenNumber   The PCD token number to set a current value for.\r
+  @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
+  @param[in]      Buffer        A pointer to the buffer to set.\r
+\r
+  @return The status of the set operation.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+LibPcdSetPtrS (\r
+  IN       UINTN    TokenNumber,\r
+  IN OUT   UINTN    *SizeOfBuffer,\r
+  IN CONST VOID     *Buffer\r
+  )\r
+{\r
+  ASSERT (SizeOfBuffer != NULL);\r
+\r
+  if (*SizeOfBuffer > 0) {\r
+    ASSERT (Buffer != NULL);\r
+  }\r
+\r
+  return (GetPcdPpiPointer ())->SetPtr (TokenNumber, SizeOfBuffer, (VOID *) Buffer);\r
+}\r
+\r
+/**\r
+  This function provides a means by which to set a value for a given PCD token.\r
+\r
+  Sets the boolean value for the token specified by TokenNumber\r
+  to the value specified by Value.\r
+\r
+  @param[in] TokenNumber    The PCD token number to set a current value for.\r
+  @param[in] Value          The boolean value to set.\r
+\r
+  @return The status of the set operation.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+LibPcdSetBoolS (\r
+  IN UINTN          TokenNumber,\r
+  IN BOOLEAN        Value\r
+  )\r
+{\r
+  return (GetPcdPpiPointer ())->SetBool (TokenNumber, Value);\r
+}\r
+\r
+/**\r
+  This function provides a means by which to set a value for a given PCD token.\r
+\r
+  Sets the 8-bit value for the token specified by TokenNumber\r
+  to the value specified by Value.\r
+\r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in] Guid           The pointer to a 128-bit unique value that\r
+                            designates which namespace to set a value from.\r
+  @param[in] TokenNumber    The PCD token number to set a current value for.\r
+  @param[in] Value          The 8-bit value to set.\r
+\r
+  @return The status of the set operation.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+LibPcdSetEx8S (\r
+  IN CONST GUID     *Guid,\r
+  IN UINTN          TokenNumber,\r
+  IN UINT8          Value\r
+  )\r
+{\r
+  ASSERT (Guid != NULL);\r
+\r
+  return (GetPiPcdPpiPointer ())->Set8 (Guid, TokenNumber, Value);\r
+}\r
+\r
+/**\r
+  This function provides a means by which to set a value for a given PCD token.\r
+\r
+  Sets the 16-bit value for the token specified by TokenNumber\r
+  to the value specified by Value.\r
+\r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in] Guid           The pointer to a 128-bit unique value that\r
+                            designates which namespace to set a value from.\r
+  @param[in] TokenNumber    The PCD token number to set a current value for.\r
+  @param[in] Value          The 16-bit value to set.\r
+\r
+  @return The status of the set operation.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+LibPcdSetEx16S (\r
+  IN CONST GUID     *Guid,\r
+  IN UINTN          TokenNumber,\r
+  IN UINT16         Value\r
+  )\r
+{\r
+  ASSERT (Guid != NULL);\r
+\r
+  return (GetPiPcdPpiPointer ())->Set16 (Guid, TokenNumber, Value);\r
+}\r
+\r
+/**\r
+  This function provides a means by which to set a value for a given PCD token.\r
+\r
+  Sets the 32-bit value for the token specified by TokenNumber\r
+  to the value specified by Value.\r
+\r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in] Guid           The pointer to a 128-bit unique value that\r
+                            designates which namespace to set a value from.\r
+  @param[in] TokenNumber    The PCD token number to set a current value for.\r
+  @param[in] Value          The 32-bit value to set.\r
+\r
+  @return The status of the set operation.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+LibPcdSetEx32S (\r
+  IN CONST GUID     *Guid,\r
+  IN UINTN          TokenNumber,\r
+  IN UINT32         Value\r
+  )\r
+{\r
+  ASSERT (Guid != NULL);\r
+\r
+  return (GetPiPcdPpiPointer ())->Set32 (Guid, TokenNumber, Value);\r
+}\r
+\r
+/**\r
+  This function provides a means by which to set a value for a given PCD token.\r
+\r
+  Sets the 64-bit value for the token specified by TokenNumber\r
+  to the value specified by Value.\r
+\r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in] Guid           The pointer to a 128-bit unique value that\r
+                            designates which namespace to set a value from.\r
+  @param[in] TokenNumber    The PCD token number to set a current value for.\r
+  @param[in] Value          The 64-bit value to set.\r
+\r
+  @return The status of the set operation.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+LibPcdSetEx64S (\r
+  IN CONST GUID     *Guid,\r
+  IN UINTN          TokenNumber,\r
+  IN UINT64         Value\r
+  )\r
+{\r
+  ASSERT (Guid != NULL);\r
+\r
+  return (GetPiPcdPpiPointer ())->Set64 (Guid, TokenNumber, Value);\r
+}\r
+\r
+/**\r
+  This function provides a means by which to set a value for a given PCD token.\r
+\r
+  Sets a buffer for the token specified by TokenNumber to the value specified by\r
+  Buffer and SizeOfBuffer. If SizeOfBuffer is greater than the maximum size\r
+  support by TokenNumber, then set SizeOfBuffer to the maximum size supported by\r
+  TokenNumber and return EFI_INVALID_PARAMETER to indicate that the set operation\r
+  was not actually performed.\r
+\r
+  If Guid is NULL, then ASSERT().\r
+  If SizeOfBuffer is NULL, then ASSERT().\r
+  If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
+\r
+  @param[in]      Guid          Pointer to a 128-bit unique value that\r
+                                designates which namespace to set a value from.\r
+  @param[in]      TokenNumber   The PCD token number to set a current value for.\r
+  @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r
+  @param[in]      Buffer        A pointer to the buffer to set.\r
+\r
+  @return The status of the set operation.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+LibPcdSetExPtrS (\r
+  IN CONST GUID     *Guid,\r
+  IN       UINTN    TokenNumber,\r
+  IN OUT   UINTN    *SizeOfBuffer,\r
+  IN       VOID     *Buffer\r
+  )\r
+{\r
+  ASSERT (Guid != NULL);\r
+\r
+  ASSERT (SizeOfBuffer != NULL);\r
+\r
+  if (*SizeOfBuffer > 0) {\r
+    ASSERT (Buffer != NULL);\r
+  }\r
+\r
+  return (GetPiPcdPpiPointer ())->SetPtr (Guid, TokenNumber, SizeOfBuffer, Buffer);\r
+}\r
+\r
+/**\r
+  This function provides a means by which to set a value for a given PCD token.\r
+\r
+  Sets the boolean value for the token specified by TokenNumber\r
+  to the value specified by Value.\r
+\r
+  If Guid is NULL, then ASSERT().\r
+\r
+  @param[in] Guid           The pointer to a 128-bit unique value that\r
+                            designates which namespace to set a value from.\r
+  @param[in] TokenNumber    The PCD token number to set a current value for.\r
+  @param[in] Value          The boolean value to set.\r
+\r
+  @return The status of the set operation.\r

 \r
 \r

+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+LibPcdSetExBoolS (\r
+  IN CONST GUID     *Guid,\r
+  IN UINTN          TokenNumber,\r
+  IN BOOLEAN        Value\r
+  )\r
+{\r
+  ASSERT (Guid != NULL);\r

 \r
 \r

+  return (GetPiPcdPpiPointer ())->SetBool (Guid, TokenNumber, Value);\r
+}\r

 \r
 /**\r
   Set up a notification function that is called when a specified token is set.\r
 \r
 /**\r
   Set up a notification function that is called when a specified token is set.\r

-  \r
-  When the token specified by TokenNumber and Guid is set, \r
-  then notification function specified by NotificationFunction is called.  \r
+\r
+  When the token specified by TokenNumber and Guid is set,\r
+  then notification function specified by NotificationFunction is called.\r

   If Guid is NULL, then the default token space is used.\r
   If NotificationFunction is NULL, then ASSERT().\r
 \r
   If Guid is NULL, then the default token space is used.\r
   If NotificationFunction is NULL, then ASSERT().\r
 \r

-  @param[in]  Guid                  Pointer to a 128-bit unique value that designates which \r
-                                    namespace to set a value from.  If NULL, then the default \r
-                                    token space is used.\r
+  @param[in]  Guid                  The pointer to a 128-bit unique value that\r
+                                    designates which namespace to set a value from.\r
+                                    If NULL, then the default token space is used.\r

   @param[in]  TokenNumber           The PCD token number to monitor.\r
   @param[in]  TokenNumber           The PCD token number to monitor.\r

-  @param[in]  NotificationFunction  The function to call when the token \r
+  @param[in]  NotificationFunction  The function to call when the token\r

                                     specified by Guid and TokenNumber is set.\r
 \r
 **/\r
                                     specified by Guid and TokenNumber is set.\r
 \r
 **/\r


@@ -869,7 +1235,7 @@ LibPcdCallbackOnSet (
 \r
   ASSERT (NotificationFunction != NULL);\r
 \r
 \r
   ASSERT (NotificationFunction != NULL);\r
 \r

-  Status = (GetPcdPpiPointer ())->CallbackOnSet (Guid, TokenNumber, NotificationFunction);\r
+  Status = (GetPiPcdPpiPointer ())->CallbackOnSet (Guid, TokenNumber, (EFI_PEI_PCD_PPI_CALLBACK) NotificationFunction);\r

 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r


@@ -880,12 +1246,12 @@ LibPcdCallbackOnSet (
 \r
 /**\r
   Disable a notification function that was established with LibPcdCallbackonSet().\r
 \r
 /**\r
   Disable a notification function that was established with LibPcdCallbackonSet().\r

-  \r
+\r

   Disable a notification function that was previously established with LibPcdCallbackOnSet().\r
   If NotificationFunction is NULL, then ASSERT().\r
   Disable a notification function that was previously established with LibPcdCallbackOnSet().\r
   If NotificationFunction is NULL, then ASSERT().\r

-  If LibPcdCallbackOnSet() was not previously called with Guid, TokenNumber, \r
+  If LibPcdCallbackOnSet() was not previously called with Guid, TokenNumber,\r

   and NotificationFunction, then ASSERT().\r
   and NotificationFunction, then ASSERT().\r

-  \r
+\r

   @param[in]  Guid                 Specify the GUID token space.\r
   @param[in]  TokenNumber          Specify the token number.\r
   @param[in]  NotificationFunction The callback function to be unregistered.\r
   @param[in]  Guid                 Specify the GUID token space.\r
   @param[in]  TokenNumber          Specify the token number.\r
   @param[in]  NotificationFunction The callback function to be unregistered.\r


@@ -903,7 +1269,7 @@ LibPcdCancelCallback (
 \r
   ASSERT (NotificationFunction != NULL);\r
 \r
 \r
   ASSERT (NotificationFunction != NULL);\r
 \r

-  Status = (GetPcdPpiPointer ())->CancelCallback (Guid, TokenNumber, NotificationFunction);\r
+  Status = (GetPiPcdPpiPointer ())->CancelCallback (Guid, TokenNumber, (EFI_PEI_PCD_PPI_CALLBACK) NotificationFunction);\r

 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r


@@ -914,35 +1280,34 @@ LibPcdCancelCallback (
 \r
 /**\r
   Retrieves the next token in a token space.\r
 \r
 /**\r
   Retrieves the next token in a token space.\r

-  \r
-  Retrieves the next PCD token number from the token space specified by Guid.  \r
-  If Guid is NULL, then the default token space is used.  If TokenNumber is 0, \r
-  then the first token number is returned.  Otherwise, the token number that \r
-  follows TokenNumber in the token space is returned.  If TokenNumber is the last \r
-  token number in the token space, then 0 is returned.  \r
-  \r
+\r
+  Retrieves the next PCD token number from the token space specified by Guid.\r
+  If Guid is NULL, then the default token space is used.  If TokenNumber is 0,\r
+  then the first token number is returned.  Otherwise, the token number that\r
+  follows TokenNumber in the token space is returned.  If TokenNumber is the last\r
+  token number in the token space, then 0 is returned.\r
+\r

   If TokenNumber is not 0 and is not in the token space specified by Guid, then ASSERT().\r
 \r
   If TokenNumber is not 0 and is not in the token space specified by Guid, then ASSERT().\r
 \r

-  @param[in]  Guid        Pointer to a 128-bit unique value that designates which namespace \r
+  @param[in]  Guid        The pointer to a 128-bit unique value that designates which namespace\r

                           to set a value from.  If NULL, then the default token space is used.\r
                           to set a value from.  If NULL, then the default token space is used.\r

-  @param[in]  TokenNumber The previous PCD token number.  If 0, then retrieves the first PCD \r
+  @param[in]  TokenNumber The previous PCD token number.  If 0, then retrieves the first PCD\r

                           token number.\r
 \r
   @return The next valid token number.\r
 \r
 **/\r
                           token number.\r
 \r
   @return The next valid token number.\r
 \r
 **/\r

-UINTN           \r
+UINTN\r

 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
   IN UINTN                    TokenNumber\r
   )\r
 {\r
 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
   IN UINTN                    TokenNumber\r
   )\r
 {\r

-  EFI_STATUS Status;\r
-\r
-  Status = (GetPcdPpiPointer ())->GetNextToken (Guid, &TokenNumber);\r
+  EFI_STATUS    Status;\r

 \r
 \r

-  ASSERT_EFI_ERROR (Status);\r
+  Status = (GetPiPcdPpiPointer ())->GetNextToken (Guid, &TokenNumber);\r
+  ASSERT (!EFI_ERROR (Status) || TokenNumber == 0);\r

 \r
   return TokenNumber;\r
 }\r
 \r
   return TokenNumber;\r
 }\r


@@ -950,13 +1315,13 @@ LibPcdGetNextToken (
 \r
 /**\r
   Used to retrieve the list of available PCD token space GUIDs.\r
 \r
 /**\r
   Used to retrieve the list of available PCD token space GUIDs.\r

-  \r
+\r

   Returns the PCD token space GUID that follows TokenSpaceGuid in the list of token spaces\r
   in the platform.\r
   If TokenSpaceGuid is NULL, then a pointer to the first PCD token spaces returned.\r
   If TokenSpaceGuid is the last PCD token space GUID in the list, then NULL is returned.\r
   Returns the PCD token space GUID that follows TokenSpaceGuid in the list of token spaces\r
   in the platform.\r
   If TokenSpaceGuid is NULL, then a pointer to the first PCD token spaces returned.\r
   If TokenSpaceGuid is the last PCD token space GUID in the list, then NULL is returned.\r

-  \r
-  @param  TokenSpaceGuid  Pointer to the a PCD token space GUID\r
+\r
+  @param  TokenSpaceGuid  The pointer to the a PCD token space GUID\r

 \r
   @return The next valid token namespace.\r
 \r
 \r
   @return The next valid token namespace.\r
 \r


@@ -967,11 +1332,7 @@ LibPcdGetNextTokenSpace (
   IN CONST GUID  *TokenSpaceGuid\r
   )\r
 {\r
   IN CONST GUID  *TokenSpaceGuid\r
   )\r
 {\r

-  EFI_STATUS Status;\r
-\r
-  Status = (GetPcdPpiPointer ())->GetNextTokenSpace (&TokenSpaceGuid);\r
-\r
-  ASSERT_EFI_ERROR (Status);\r
+  (GetPiPcdPpiPointer ())->GetNextTokenSpace (&TokenSpaceGuid);\r

 \r
   return (GUID *) TokenSpaceGuid;\r
 }\r
 \r
   return (GUID *) TokenSpaceGuid;\r
 }\r


@@ -980,31 +1341,31 @@ LibPcdGetNextTokenSpace (
 \r
 /**\r
   Sets a value of a patchable PCD entry that is type pointer.\r
 \r
 /**\r
   Sets a value of a patchable PCD entry that is type pointer.\r

-  \r
-  Sets the PCD entry specified by PatchVariable to the value specified by Buffer \r
-  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than \r
-  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return \r
-  NULL to indicate that the set operation was not actually performed.  \r
-  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to \r
+\r
+  Sets the PCD entry specified by PatchVariable to the value specified by Buffer\r
+  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than\r
+  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return\r
+  NULL to indicate that the set operation was not actually performed.\r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to\r

   MaximumDatumSize and NULL must be returned.\r
   MaximumDatumSize and NULL must be returned.\r

-  \r
+\r

   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r
   If PatchVariable is NULL, then ASSERT().\r
   If SizeOfBuffer is NULL, then ASSERT().\r
   If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
 \r

-  @param[in] PatchVariable      A pointer to the global variable in a module that is \r
+  @param[out] PatchVariable     A pointer to the global variable in a module that is\r

                                 the target of the set operation.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
                                 the target of the set operation.\r
   @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
   @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
   @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r

-  \r
+\r

   @return Return the pointer to the buffer been set.\r
 \r
 **/\r
 VOID *\r
 EFIAPI\r
 LibPatchPcdSetPtr (\r
   @return Return the pointer to the buffer been set.\r
 \r
 **/\r
 VOID *\r
 EFIAPI\r
 LibPatchPcdSetPtr (\r

-  IN        VOID        *PatchVariable,\r
+  OUT       VOID        *PatchVariable,\r

   IN        UINTN       MaximumDatumSize,\r
   IN OUT    UINTN       *SizeOfBuffer,\r
   IN CONST  VOID        *Buffer\r
   IN        UINTN       MaximumDatumSize,\r
   IN OUT    UINTN       *SizeOfBuffer,\r
   IN CONST  VOID        *Buffer\r


@@ -1012,7 +1373,7 @@ LibPatchPcdSetPtr (
 {\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r
 {\r
   ASSERT (PatchVariable != NULL);\r
   ASSERT (SizeOfBuffer  != NULL);\r

-  \r
+\r

   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r
   if (*SizeOfBuffer > 0) {\r
     ASSERT (Buffer != NULL);\r
   }\r


@@ -1022,10 +1383,237 @@ LibPatchPcdSetPtr (
     *SizeOfBuffer = MaximumDatumSize;\r
     return NULL;\r
   }\r
     *SizeOfBuffer = MaximumDatumSize;\r
     return NULL;\r
   }\r

-    \r
+\r

   CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r
   CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r

-  \r
+\r

   return (VOID *) Buffer;\r
 }\r
 \r
   return (VOID *) Buffer;\r
 }\r
 \r

+/**\r
+  Sets a value of a patchable PCD entry that is type pointer.\r
+\r
+  Sets the PCD entry specified by PatchVariable to the value specified\r
+  by Buffer and SizeOfBuffer. If SizeOfBuffer is greater than MaximumDatumSize,\r
+  then set SizeOfBuffer to MaximumDatumSize and return RETURN_INVALID_PARAMETER\r
+  to indicate that the set operation was not actually performed.\r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to\r
+  MaximumDatumSize and RETURN_INVALID_PARAMETER must be returned.\r
+\r
+  If PatchVariable is NULL, then ASSERT().\r
+  If SizeOfBuffer is NULL, then ASSERT().\r
+  If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
+\r
+  @param[out] PatchVariable     A pointer to the global variable in a module that is\r
+                                the target of the set operation.\r
+  @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
+  @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
+  @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
+\r
+  @return The status of the set operation.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+LibPatchPcdSetPtrS (\r
+  OUT      VOID     *PatchVariable,\r
+  IN       UINTN    MaximumDatumSize,\r
+  IN OUT   UINTN    *SizeOfBuffer,\r
+  IN CONST VOID     *Buffer\r
+  )\r
+{\r
+  ASSERT (PatchVariable != NULL);\r
+  ASSERT (SizeOfBuffer  != NULL);\r

 \r
 \r

+  if (*SizeOfBuffer > 0) {\r
+    ASSERT (Buffer != NULL);\r
+  }\r
+\r
+  if ((*SizeOfBuffer > MaximumDatumSize) ||\r
+      (*SizeOfBuffer == MAX_ADDRESS)) {\r
+    *SizeOfBuffer = MaximumDatumSize;\r
+    return RETURN_INVALID_PARAMETER;\r
+  }\r
+\r
+  CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r
+\r
+  return RETURN_SUCCESS;\r
+}\r
+\r
+\r
+/**\r
+  Sets a value and size of a patchable PCD entry that is type pointer.\r
+\r
+  Sets the PCD entry specified by PatchVariable to the value specified by Buffer\r
+  and SizeOfBuffer.  Buffer is returned.  If SizeOfBuffer is greater than\r
+  MaximumDatumSize, then set SizeOfBuffer to MaximumDatumSize and return\r
+  NULL to indicate that the set operation was not actually performed.\r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to\r
+  MaximumDatumSize and NULL must be returned.\r
+\r
+  If PatchVariable is NULL, then ASSERT().\r
+  If SizeOfPatchVariable is NULL, then ASSERT().\r
+  If SizeOfBuffer is NULL, then ASSERT().\r
+  If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
+\r
+  @param[out] PatchVariable     A pointer to the global variable in a module that is\r
+                                the target of the set operation.\r
+  @param[out] SizeOfPatchVariable A pointer to the size, in bytes, of PatchVariable.\r
+  @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
+  @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
+  @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
+\r
+  @return Return the pointer to the buffer been set.\r
+\r
+**/\r
+VOID *\r
+EFIAPI\r
+LibPatchPcdSetPtrAndSize (\r
+  OUT       VOID        *PatchVariable,\r
+  OUT       UINTN       *SizeOfPatchVariable,\r
+  IN        UINTN       MaximumDatumSize,\r
+  IN OUT    UINTN       *SizeOfBuffer,\r
+  IN CONST  VOID        *Buffer\r
+  )\r
+{\r
+  ASSERT (PatchVariable != NULL);\r
+  ASSERT (SizeOfPatchVariable != NULL);\r
+  ASSERT (SizeOfBuffer  != NULL);\r
+\r
+  if (*SizeOfBuffer > 0) {\r
+    ASSERT (Buffer != NULL);\r
+  }\r
+\r
+  if ((*SizeOfBuffer > MaximumDatumSize) ||\r
+      (*SizeOfBuffer == MAX_ADDRESS)) {\r
+    *SizeOfBuffer = MaximumDatumSize;\r
+    return NULL;\r
+  }\r
+\r
+  CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r
+  *SizeOfPatchVariable = *SizeOfBuffer;\r
+\r
+  return (VOID *) Buffer;\r
+}\r
+\r
+/**\r
+  Sets a value and size of a patchable PCD entry that is type pointer.\r
+\r
+  Sets the PCD entry specified by PatchVariable to the value specified\r
+  by Buffer and SizeOfBuffer. If SizeOfBuffer is greater than MaximumDatumSize,\r
+  then set SizeOfBuffer to MaximumDatumSize and return RETURN_INVALID_PARAMETER\r
+  to indicate that the set operation was not actually performed.\r
+  If SizeOfBuffer is set to MAX_ADDRESS, then SizeOfBuffer must be set to\r
+  MaximumDatumSize and RETURN_INVALID_PARAMETER must be returned.\r
+\r
+  If PatchVariable is NULL, then ASSERT().\r
+  If SizeOfPatchVariable is NULL, then ASSERT().\r
+  If SizeOfBuffer is NULL, then ASSERT().\r
+  If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
+\r
+  @param[out] PatchVariable     A pointer to the global variable in a module that is\r
+                                the target of the set operation.\r
+  @param[out] SizeOfPatchVariable A pointer to the size, in bytes, of PatchVariable.\r
+  @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
+  @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
+  @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
+\r
+  @return The status of the set operation.\r
+\r
+**/\r
+RETURN_STATUS\r
+EFIAPI\r
+LibPatchPcdSetPtrAndSizeS (\r
+  OUT      VOID     *PatchVariable,\r
+  OUT      UINTN    *SizeOfPatchVariable,\r
+  IN       UINTN    MaximumDatumSize,\r
+  IN OUT   UINTN    *SizeOfBuffer,\r
+  IN CONST VOID     *Buffer\r
+  )\r
+{\r
+  ASSERT (PatchVariable != NULL);\r
+  ASSERT (SizeOfPatchVariable != NULL);\r
+  ASSERT (SizeOfBuffer  != NULL);\r
+\r
+  if (*SizeOfBuffer > 0) {\r
+    ASSERT (Buffer != NULL);\r
+  }\r
+\r
+  if ((*SizeOfBuffer > MaximumDatumSize) ||\r
+      (*SizeOfBuffer == MAX_ADDRESS)) {\r
+    *SizeOfBuffer = MaximumDatumSize;\r
+    return RETURN_INVALID_PARAMETER;\r
+  }\r
+\r
+  CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r
+  *SizeOfPatchVariable = *SizeOfBuffer;\r
+\r
+  return RETURN_SUCCESS;\r
+}\r
+\r
+/**\r
+  Retrieve additional information associated with a PCD token.\r
+\r
+  This includes information such as the type of value the TokenNumber is associated with as well as possible\r
+  human readable name that is associated with the token.\r
+\r
+  If TokenNumber is not in the default token space specified, then ASSERT().\r
+\r
+  @param[in]    TokenNumber The PCD token number.\r
+  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.\r
+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.\r
+**/\r
+VOID\r
+EFIAPI\r
+LibPcdGetInfo (\r
+  IN        UINTN           TokenNumber,\r
+  OUT       PCD_INFO        *PcdInfo\r
+  )\r
+{\r
+  EFI_STATUS Status;\r
+\r
+  Status = GetPcdInfoPpiPointer()->GetInfo (TokenNumber, (EFI_PCD_INFO *) PcdInfo);\r
+  ASSERT_EFI_ERROR (Status);\r
+}\r
+\r
+/**\r
+  Retrieve additional information associated with a PCD token.\r
+\r
+  This includes information such as the type of value the TokenNumber is associated with as well as possible\r
+  human readable name that is associated with the token.\r
+\r
+  If TokenNumber is not in the token space specified by Guid, then ASSERT().\r
+\r
+  @param[in]    Guid        The 128-bit unique value that designates the namespace from which to extract the value.\r
+  @param[in]    TokenNumber The PCD token number.\r
+  @param[out]   PcdInfo     The returned information associated with the requested TokenNumber.\r
+                            The caller is responsible for freeing the buffer that is allocated by callee for PcdInfo->PcdName.\r
+**/\r
+VOID\r
+EFIAPI\r
+LibPcdGetInfoEx (\r
+  IN CONST  GUID            *Guid,\r
+  IN        UINTN           TokenNumber,\r
+  OUT       PCD_INFO        *PcdInfo\r
+  )\r
+{\r
+  EFI_STATUS Status;\r
+\r
+  Status = GetPiPcdInfoPpiPointer()->GetInfo (Guid, TokenNumber, (EFI_PCD_INFO *) PcdInfo);\r
+  ASSERT_EFI_ERROR (Status);\r
+}\r
+\r
+/**\r
+  Retrieve the currently set SKU Id.\r
+\r
+  @return   The currently set SKU Id. If the platform has not set at a SKU Id, then the\r
+            default SKU Id value of 0 is returned. If the platform has set a SKU Id, then the currently set SKU\r
+            Id is returned.\r
+**/\r
+UINTN\r
+EFIAPI\r
+LibPcdGetSku (\r
+  VOID\r
+  )\r
+{\r
+  return GetPiPcdInfoPpiPointer()->GetSku ();\r
+}\r