Sync Pcd Service Driver, PEIM and library with MDE Spec 0.55a.

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

diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
index 8ef52055930cde23973a96194943b0c1faefec5b..fca14af8684f3bbba5cb59fa2f5fa4f88e074d36 100644 (file)
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
@@ -61,10 +61,10 @@ GetPcdPpiPtr (
   @retval SKU_ID Return the SKU ID that just be set.\r
 \r
 **/\r
-SKU_ID\r
+UINTN\r
 EFIAPI\r
 LibPcdSetSku (\r
-  IN SKU_ID  SkuId\r
+  IN UINTN  SkuId\r
   )\r
 {\r
 \r
@@ -86,7 +86,7 @@ LibPcdSetSku (
 UINT8\r
 EFIAPI\r
 LibPcdGet8 (\r
-  IN PCD_TOKEN_NUMBER             TokenNumber\r
+  IN UINTN                        TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -109,7 +109,7 @@ LibPcdGet8 (
 UINT16\r
 EFIAPI\r
 LibPcdGet16 (\r
-  IN PCD_TOKEN_NUMBER             TokenNumber\r
+  IN UINTN                        TokenNumber\r
   )\r
 {\r
   PCD_PPI  *PcdPpi;\r
@@ -132,7 +132,7 @@ LibPcdGet16 (
 UINT32\r
 EFIAPI\r
 LibPcdGet32 (\r
-  IN PCD_TOKEN_NUMBER             TokenNumber\r
+  IN UINTN                        TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -155,7 +155,7 @@ LibPcdGet32 (
 UINT64\r
 EFIAPI\r
 LibPcdGet64 (\r
-  IN PCD_TOKEN_NUMBER             TokenNumber\r
+  IN UINTN                        TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -178,7 +178,7 @@ LibPcdGet64 (
 VOID *\r
 EFIAPI\r
 LibPcdGetPtr (\r
-  IN PCD_TOKEN_NUMBER             TokenNumber\r
+  IN UINTN                        TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -201,7 +201,7 @@ LibPcdGetPtr (
 BOOLEAN \r
 EFIAPI\r
 LibPcdGetBool (\r
-  IN PCD_TOKEN_NUMBER             TokenNumber\r
+  IN UINTN                        TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -224,7 +224,7 @@ LibPcdGetBool (
 UINTN\r
 EFIAPI\r
 LibPcdGetSize (\r
-  IN PCD_TOKEN_NUMBER             TokenNumber\r
+  IN UINTN                        TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -251,7 +251,7 @@ UINT8
 EFIAPI\r
 LibPcdGetEx8 (\r
   IN CONST GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -278,7 +278,7 @@ UINT16
 EFIAPI\r
 LibPcdGetEx16 (\r
   IN CONST GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -305,7 +305,7 @@ UINT32
 EFIAPI\r
 LibPcdGetEx32 (\r
   IN CONST GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -333,7 +333,7 @@ UINT64
 EFIAPI\r
 LibPcdGetEx64 (\r
   IN CONST GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -360,7 +360,7 @@ VOID *
 EFIAPI\r
 LibPcdGetExPtr (\r
   IN CONST GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -387,7 +387,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdGetExBool (\r
   IN CONST GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -414,7 +414,7 @@ UINTN
 EFIAPI\r
 LibPcdGetExSize (\r
   IN CONST GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r
@@ -439,7 +439,7 @@ LibPcdGetExSize (
 UINT8\r
 EFIAPI\r
 LibPcdSet8 (\r
-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r
   IN UINT8             Value\r
   )\r
 {\r
@@ -471,7 +471,7 @@ LibPcdSet8 (
 UINT16\r
 EFIAPI\r
 LibPcdSet16 (\r
-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r
   IN UINT16            Value\r
   )\r
 {\r
@@ -503,7 +503,7 @@ LibPcdSet16 (
 UINT32\r
 EFIAPI\r
 LibPcdSet32 (\r
-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r
   IN UINT32             Value\r
   )\r
 {\r
@@ -534,7 +534,7 @@ LibPcdSet32 (
 UINT64\r
 EFIAPI\r
 LibPcdSet64 (\r
-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r
   IN UINT64             Value\r
   )\r
 {\r
@@ -567,7 +567,7 @@ LibPcdSet64 (
 VOID *\r
 EFIAPI\r
 LibPcdSetPtr (\r
-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   )\r
@@ -600,7 +600,7 @@ LibPcdSetPtr (
 BOOLEAN\r
 EFIAPI\r
 LibPcdSetBool (\r
-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r
   IN BOOLEAN           Value\r
   )\r
 {\r
@@ -636,7 +636,7 @@ UINT8
 EFIAPI\r
 LibPcdSetEx8 (\r
   IN CONST GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r
   IN UINT8             Value\r
   )\r
 {\r
@@ -672,7 +672,7 @@ UINT16
 EFIAPI\r
 LibPcdSetEx16 (\r
   IN CONST GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r
   IN UINT16            Value\r
   )\r
 {\r
@@ -708,7 +708,7 @@ UINT32
 EFIAPI\r
 LibPcdSetEx32 (\r
   IN CONST GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r
   IN UINT32             Value\r
   )\r
 {\r
@@ -744,7 +744,7 @@ UINT64
 EFIAPI\r
 LibPcdSetEx64 (\r
   IN CONST GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r
   IN UINT64            Value\r
   )\r
 {\r
@@ -781,7 +781,7 @@ VOID *
 EFIAPI\r
 LibPcdSetExPtr (\r
   IN CONST GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   )\r
@@ -817,7 +817,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdSetExBool (\r
   IN CONST GUID        *Guid,\r
-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r
   IN BOOLEAN           Value\r
   )\r
 {\r
@@ -856,7 +856,7 @@ VOID
 EFIAPI\r
 LibPcdCallbackOnSet (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
-  IN PCD_TOKEN_NUMBER         TokenNumber,\r
+  IN UINTN                    TokenNumber,\r
   IN PCD_CALLBACK             NotificationFunction\r
   )\r
 {\r
@@ -890,7 +890,7 @@ VOID
 EFIAPI\r
 LibPcdCancelCallback (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
-  IN PCD_TOKEN_NUMBER         TokenNumber,\r
+  IN UINTN                    TokenNumber,\r
   IN PCD_CALLBACK             NotificationFunction\r
   )\r
 {\r
@@ -922,14 +922,14 @@ LibPcdCancelCallback (
   @param[in]  The previous PCD token number.  If 0, then retrieves the first PCD \r
               token number.\r
 \r
-  @retval PCD_TOKEN_NUMBER The next valid token number.\r
+  @retval UINTN            The next valid token number.\r
 \r
 **/\r
-PCD_TOKEN_NUMBER           \r
+UINTN                      \r
 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID             *Guid, OPTIONAL\r
-  IN       PCD_TOKEN_NUMBER TokenNumber\r
+  IN       UINTN            TokenNumber\r
   )\r
 {\r
   EFI_STATUS Status;\r