Sync up Pcd Library Instances and PCD Driver/PEIM with Pcd spec 0.51 and Mde 0.51

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

diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
index 29fdeb0ee4525e9e5def15f4e45c909cb03bcad1..9000c859b570837fc57d95538ca857ad3c5357c5 100644 (file)
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
@@ -58,23 +58,17 @@ GetPcdPpiPtr (
   @param[in]  SkuId The SKU value that will be used when the PCD service will retrieve and \r
               set values associated with a PCD token.\r
 \r
-  @retval UINTN Return the SKU ID that just be set.\r
+  @retval SKU_ID Return the SKU ID that just be set.\r
 \r
 **/\r
-UINTN\r
+SKU_ID\r
 EFIAPI\r
 LibPcdSetSku (\r
-  IN UINTN  SkuId\r
+  IN SKU_ID  SkuId\r
   )\r
 {\r
-  EFI_STATUS  Status;\r
-  PCD_PPI     *PcdPpi;\r
-\r
-  PcdPpi = GetPcdPpiPtr ();\r
 \r
-\r
-  Status = PcdPpi->SetSku (SkuId);\r
-  ASSERT_EFI_ERROR (Status);\r
+  GetPcdPpiPtr()->SetSku (SkuId);;\r
 \r
   return SkuId;\r
 }\r
@@ -92,7 +86,7 @@ LibPcdSetSku (
 UINT8\r
 EFIAPI\r
 LibPcdGet8 (\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER             TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -115,7 +109,7 @@ LibPcdGet8 (
 UINT16\r
 EFIAPI\r
 LibPcdGet16 (\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER             TokenNumber\r
   )\r
 {\r
   PCD_PPI  *PcdPpi;\r
@@ -138,7 +132,7 @@ LibPcdGet16 (
 UINT32\r
 EFIAPI\r
 LibPcdGet32 (\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER             TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -161,7 +155,7 @@ LibPcdGet32 (
 UINT64\r
 EFIAPI\r
 LibPcdGet64 (\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER             TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -184,7 +178,7 @@ LibPcdGet64 (
 VOID *\r
 EFIAPI\r
 LibPcdGetPtr (\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER             TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -207,7 +201,7 @@ LibPcdGetPtr (
 BOOLEAN \r
 EFIAPI\r
 LibPcdGetBool (\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER             TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -230,7 +224,7 @@ LibPcdGetBool (
 UINTN\r
 EFIAPI\r
 LibPcdGetSize (\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER             TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -257,7 +251,7 @@ UINT8
 EFIAPI\r
 LibPcdGetEx8 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -284,7 +278,7 @@ UINT16
 EFIAPI\r
 LibPcdGetEx16 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -311,7 +305,7 @@ UINT32
 EFIAPI\r
 LibPcdGetEx32 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -339,7 +333,7 @@ UINT64
 EFIAPI\r
 LibPcdGetEx64 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -366,7 +360,7 @@ VOID *
 EFIAPI\r
 LibPcdGetExPtr (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -393,7 +387,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdGetExBool (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -420,7 +414,7 @@ UINTN
 EFIAPI\r
 LibPcdGetExSize (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -445,7 +439,7 @@ LibPcdGetExSize (
 UINT8\r
 EFIAPI\r
 LibPcdSet8 (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT8             Value\r
   )\r
 {\r
@@ -477,7 +471,7 @@ LibPcdSet8 (
 UINT16\r
 EFIAPI\r
 LibPcdSet16 (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT16            Value\r
   )\r
 {\r
@@ -509,7 +503,7 @@ LibPcdSet16 (
 UINT32\r
 EFIAPI\r
 LibPcdSet32 (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT32             Value\r
   )\r
 {\r
@@ -540,7 +534,7 @@ LibPcdSet32 (
 UINT64\r
 EFIAPI\r
 LibPcdSet64 (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT64             Value\r
   )\r
 {\r
@@ -573,8 +567,9 @@ LibPcdSet64 (
 VOID *\r
 EFIAPI\r
 LibPcdSetPtr (\r
-  IN UINTN             TokenNumber,\r
-  IN CONST VOID        *Value\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             SizeOfBuffer,\r
+  IN VOID              *Buffer\r
   )\r
 {\r
   EFI_STATUS Status;\r
@@ -583,11 +578,11 @@ LibPcdSetPtr (
   PcdPpi = GetPcdPpiPtr ();\r
 \r
 \r
-  Status = PcdPpi->SetPtr (TokenNumber, Value);\r
+  Status = PcdPpi->SetPtr (TokenNumber, SizeOfBuffer, Buffer);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  return (VOID *)Value;\r
+  return Buffer;\r
 }\r
 \r
 \r
@@ -605,7 +600,7 @@ LibPcdSetPtr (
 BOOLEAN\r
 EFIAPI\r
 LibPcdSetBool (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN BOOLEAN           Value\r
   )\r
 {\r
@@ -641,7 +636,7 @@ UINT8
 EFIAPI\r
 LibPcdSetEx8 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT8             Value\r
   )\r
 {\r
@@ -677,7 +672,7 @@ UINT16
 EFIAPI\r
 LibPcdSetEx16 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT16            Value\r
   )\r
 {\r
@@ -713,7 +708,7 @@ UINT32
 EFIAPI\r
 LibPcdSetEx32 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT32             Value\r
   )\r
 {\r
@@ -749,7 +744,7 @@ UINT64
 EFIAPI\r
 LibPcdSetEx64 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT64            Value\r
   )\r
 {\r
@@ -786,8 +781,9 @@ VOID *
 EFIAPI\r
 LibPcdSetExPtr (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
-  IN CONST VOID        *Value\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             SizeOfBuffer,\r
+  IN VOID              *Buffer\r
   )\r
 {\r
   EFI_STATUS Status;\r
@@ -795,12 +791,11 @@ LibPcdSetExPtr (
 \r
   PcdPpi = GetPcdPpiPtr ();\r
 \r
-\r
-  Status = PcdPpi->SetPtrEx (Guid, TokenNumber, Value);\r
+  Status = PcdPpi->SetPtrEx (Guid, TokenNumber, SizeOfBuffer, Buffer);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  return (VOID *)Value;\r
+  return Buffer;\r
 }\r
 \r
 \r
@@ -822,7 +817,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdSetExBool (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN BOOLEAN           Value\r
   )\r
 {\r
@@ -861,7 +856,7 @@ VOID
 EFIAPI\r
 LibPcdCallbackOnSet (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
-  IN UINTN                    TokenNumber,\r
+  IN PCD_TOKEN_NUMBER         TokenNumber,\r
   IN PCD_CALLBACK             NotificationFunction\r
   )\r
 {\r
@@ -895,7 +890,7 @@ VOID
 EFIAPI\r
 LibPcdCancelCallback (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
-  IN UINTN                    TokenNumber,\r
+  IN PCD_TOKEN_NUMBER         TokenNumber,\r
   IN PCD_CALLBACK             NotificationFunction\r
   )\r
 {\r
@@ -927,14 +922,14 @@ LibPcdCancelCallback (
   @param[in]  The previous PCD token number.  If 0, then retrieves the first PCD \r
               token number.\r
 \r
-  @retval UINTN The next valid token number.\r
+  @retval PCD_TOKEN_NUMBER The next valid token number.\r
 \r
 **/\r
-UINTN           \r
+PCD_TOKEN_NUMBER           \r
 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID             *Guid, OPTIONAL\r
-  IN OUT UINTN              *TokenNumber\r
+  IN OUT PCD_TOKEN_NUMBER   TokenNumber\r
   )\r
 {\r
   EFI_STATUS Status;\r
@@ -943,9 +938,9 @@ LibPcdGetNextToken (
   PcdPpi = GetPcdPpiPtr ();\r
 \r
 \r
-  Status = PcdPpi->GetNextToken (Guid, TokenNumber);\r
+  Status = PcdPpi->GetNextToken (Guid, &TokenNumber);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  return (*TokenNumber);\r
+  return TokenNumber;\r
 }\r