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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@285 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Common/Pcd.h b/MdePkg/Include/Common/Pcd.h
index 7d1362ccf387be208f7809fc3aedbfdccd73bc58..6f34c74982150cc21d57892e36d2c435a64f1f98 100644 (file)
--- a/MdePkg/Include/Common/Pcd.h
+++ b/MdePkg/Include/Common/Pcd.h
@@ -20,14 +20,6 @@
 typedef UINT32  PCD_TOKEN_NUMBER;\r
 typedef UINT8   SKU_ID;\r
 \r
-#define PCD_INVALID_TOKEN     ((PCD_TOKEN_NUMBER)(-1))\r
-\r
-typedef\r
-VOID\r
-(EFIAPI *PCD_PROTOCOL_CALLBACK) (\r
-  IN  UINT32       CallBackToken,\r
-  IN  VOID         *TokenData,\r
-  IN  UINTN        TokenDataSize\r
-  );\r
+#define PCD_INVALID_TOKEN_NUMBER     ((PCD_TOKEN_NUMBER)(-1))\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Dxe.h b/MdePkg/Include/Dxe.h
index 020c51e5fa06421d3f9ffb5f4586767b1ca86e09..d97209d1a44465ba3ea2d2c0dd28d57e6f97fa0e 100644 (file)
--- a/MdePkg/Include/Dxe.h
+++ b/MdePkg/Include/Dxe.h
@@ -46,6 +46,5 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/DataHubRecords.h>\r
 \r
 #include <Protocol/Pcd.h>\r
-#include <Common/PcdTemp.h> //This will be removed when PCD PEIM is completed!\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Library/PcdLib.h b/MdePkg/Include/Library/PcdLib.h
index 631aa4002543b7d15661caff71ee135485a1ec9c..5a3cbfa46ad1475968f51f983ce2edacefddbbca 100644 (file)
--- a/MdePkg/Include/Library/PcdLib.h
+++ b/MdePkg/Include/Library/PcdLib.h
@@ -18,6 +18,8 @@ Module Name: PcdLib.h
 #ifndef __PCD_LIB_H__\r
 #define __PCD_LIB_H__\r
 \r
+#include <Common/Pcd.h>\r
+\r
 \r
 #define PcdToken(TokenName)  _PCD_TOKEN_##TokenName\r
 \r
@@ -54,6 +56,12 @@ Module Name: PcdLib.h
 #define PatchPcdGetBool(TokenName)  _gPcd_BinaryPatch_##TokenName\r
 #define PatchPcdGetPtr(TokenName)   ((VOID *)_gPcd_BinaryPatch_##TokenName)\r
 \r
+#define PatchPcdSet8(TokenName, Value)     (_gPcd_BinaryPatch_##TokenName = Value)\r
+#define PatchPcdSet16(TokenName, Value)    (_gPcd_BinaryPatch_##TokenName = Value)\r
+#define PatchPcdSet32(TokenName, Value)    (_gPcd_BinaryPatch_##TokenName = Value)\r
+#define PatchPcdSet64(TokenName, Value)    (_gPcd_BinaryPatch_##TokenName = Value)\r
+#define PatchPcdSetBool(TokenName, Value)  (_gPcd_BinaryPatch_##TokenName = Value)\r
+#define PatchPcdSetPtr(TokenName, Value, Size)   CopyMem (_gPcd_BinaryPatch_##TokenName, Value, Size)\r
 \r
 //\r
 // Dynamic is via the protocol with only the TokenNumber as argument\r
@@ -106,13 +114,13 @@ Module Name: PcdLib.h
   @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
 \r
@@ -127,7 +135,7 @@ LibPcdSetSku (
 UINT8\r
 EFIAPI\r
 LibPcdGet8 (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 \r
@@ -142,7 +150,7 @@ LibPcdGet8 (
 UINT16\r
 EFIAPI\r
 LibPcdGet16 (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 \r
@@ -157,7 +165,7 @@ LibPcdGet16 (
 UINT32\r
 EFIAPI\r
 LibPcdGet32 (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 \r
@@ -172,7 +180,7 @@ LibPcdGet32 (
 UINT64\r
 EFIAPI\r
 LibPcdGet64 (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 \r
@@ -187,7 +195,7 @@ LibPcdGet64 (
 VOID *\r
 EFIAPI\r
 LibPcdGetPtr (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 \r
@@ -202,7 +210,7 @@ LibPcdGetPtr (
 BOOLEAN \r
 EFIAPI\r
 LibPcdGetBool (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 \r
@@ -217,7 +225,7 @@ LibPcdGetBool (
 UINTN\r
 EFIAPI\r
 LibPcdGetSize (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 \r
@@ -236,7 +244,7 @@ UINT8
 EFIAPI\r
 LibPcdGetEx8 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 \r
@@ -255,7 +263,7 @@ UINT16
 EFIAPI\r
 LibPcdGetEx16 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 \r
@@ -274,7 +282,7 @@ UINT32
 EFIAPI\r
 LibPcdGetEx32 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 \r
@@ -293,7 +301,7 @@ UINT64
 EFIAPI\r
 LibPcdGetEx64 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 \r
@@ -312,7 +320,7 @@ VOID *
 EFIAPI\r
 LibPcdGetExPtr (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 \r
@@ -331,7 +339,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdGetExBool (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 \r
@@ -350,7 +358,7 @@ UINTN
 EFIAPI\r
 LibPcdGetExSize (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 \r
@@ -367,7 +375,7 @@ LibPcdGetExSize (
 UINT8\r
 EFIAPI\r
 LibPcdSet8 (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT8             Value\r
   );\r
 \r
@@ -385,7 +393,7 @@ LibPcdSet8 (
 UINT16\r
 EFIAPI\r
 LibPcdSet16 (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT16            Value\r
   );\r
 \r
@@ -403,7 +411,7 @@ LibPcdSet16 (
 UINT32\r
 EFIAPI\r
 LibPcdSet32 (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT32            Value\r
   );\r
 \r
@@ -421,7 +429,7 @@ LibPcdSet32 (
 UINT64\r
 EFIAPI\r
 LibPcdSet64 (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT64            Value\r
   );\r
 \r
@@ -440,7 +448,8 @@ LibPcdSet64 (
 VOID*\r
 EFIAPI\r
 LibPcdSetPtr (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             SizeOfBuffer,\r
   IN CONST VOID        *Value\r
   );\r
 \r
@@ -458,7 +467,7 @@ LibPcdSetPtr (
 BOOLEAN\r
 EFIAPI\r
 LibPcdSetBool (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN BOOLEAN           Value\r
   );\r
 \r
@@ -480,7 +489,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
@@ -502,7 +511,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
@@ -524,7 +533,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
@@ -546,7 +555,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
@@ -569,7 +578,8 @@ VOID *
 EFIAPI\r
 LibPcdSetExPtr (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             SizeOfBuffer,\r
   IN CONST VOID        *Value\r
   );\r
 \r
@@ -591,7 +601,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
@@ -613,10 +623,10 @@ LibPcdSetExBool (
 typedef\r
 VOID\r
 (EFIAPI *PCD_CALLBACK) (\r
-  IN  CONST GUID   *CallBackGuid, OPTIONAL\r
-  IN  UINTN        CallBackToken,\r
-  IN  VOID         *TokenData,\r
-  IN  UINTN        TokenDataSize\r
+  IN        CONST GUID        *CallBackGuid, OPTIONAL\r
+  IN        PCD_TOKEN_NUMBER  CallBackToken,\r
+  IN  OUT   VOID              *TokenData,\r
+  IN        UINTN             TokenDataSize\r
   );\r
 \r
 \r
@@ -640,7 +650,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
@@ -659,7 +669,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
@@ -677,14 +687,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 UINTN                    *TokenNumber\r
+  IN PCD_TOKEN_NUMBER         TokenNumber\r
   );\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Peim.h b/MdePkg/Include/Peim.h
index ebc6b97d0b067854ee7d26eb1604e4464a6410c3..97c934b69470f92a0c1b5ea0e0dbb650db10f819 100644 (file)
--- a/MdePkg/Include/Peim.h
+++ b/MdePkg/Include/Peim.h
@@ -49,6 +49,5 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/GlobalVariable.h>\r
 \r
 #include <Ppi/Pcd.h>\r
-#include <Common/PcdTemp.h> //This will be removed when PCD PEIM is completed!\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Ppi/Pcd.h b/MdePkg/Include/Ppi/Pcd.h
index 80273753843a36a25e390a09eff04d6d407e5175..1625b8739e81e81adb229bbbd3f1bf4881ce90da 100644 (file)
--- a/MdePkg/Include/Ppi/Pcd.h
+++ b/MdePkg/Include/Ppi/Pcd.h
@@ -17,149 +17,150 @@
 #ifndef __PCD_H__\r
 #define __PCD_H__\r
 \r
+#include <Common/Pcd.h>\r
+\r
 extern EFI_GUID gPcdPpiGuid;\r
 \r
 #define PCD_PPI_GUID \\r
   { 0x632df884, 0x8023, 0x4872, { 0xb6, 0x70, 0xb7, 0x4a, 0x30, 0x19, 0x16, 0xe9 } }\r
 \r
-typedef UINT8   SKU_ID;\r
-\r
 typedef \r
-EFI_STATUS\r
+VOID\r
 (EFIAPI *PCD_PPI_SET_SKU) (\r
-  IN  UINTN          SkuId\r
+  IN  SKU_ID          SkuId\r
   );\r
 \r
 typedef\r
 UINT8\r
 (EFIAPI *PCD_PPI_GET8) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT16\r
 (EFIAPI *PCD_PPI_GET16) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT32\r
 (EFIAPI *PCD_PPI_GET32) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT64\r
 (EFIAPI *PCD_PPI_GET64) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 VOID *\r
 (EFIAPI *PCD_PPI_GET_POINTER) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
 (EFIAPI *PCD_PPI_GET_BOOLEAN) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINTN\r
 (EFIAPI *PCD_PPI_GET_SIZE) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT8\r
 (EFIAPI *PCD_PPI_GET_EX_8) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT16\r
 (EFIAPI *PCD_PPI_GET_EX_16) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN              TokenNumber\r
+  IN PCD_TOKEN_NUMBER   TokenNumber\r
   );\r
 \r
 typedef\r
 UINT32\r
 (EFIAPI *PCD_PPI_GET_EX_32) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT64\r
 (EFIAPI *PCD_PPI_GET_EX_64) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 VOID *\r
 (EFIAPI *PCD_PPI_GET_EX_POINTER) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
 (EFIAPI *PCD_PPI_GET_EX_BOOLEAN) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINTN\r
 (EFIAPI *PCD_PPI_GET_EX_SIZE) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET8) (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT8             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET16) (\r
-  IN UINTN              TokenNumber,\r
+  IN PCD_TOKEN_NUMBER   TokenNumber,\r
   IN UINT16             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET32) (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT32            Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET64) (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT64            Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_POINTER) (\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
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_BOOLEAN) (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN BOOLEAN           Value\r
   );\r
 \r
@@ -167,7 +168,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_8) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT8             Value\r
   );\r
 \r
@@ -175,7 +176,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_16) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT16            Value\r
   );\r
 \r
@@ -183,7 +184,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_32) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT32            Value\r
   );\r
 \r
@@ -191,7 +192,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_64) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT64            Value\r
   );\r
 \r
@@ -199,15 +200,16 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_POINTER) (\r
   IN CONST EFI_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
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_BOOLEAN) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN BOOLEAN           Value\r
   );\r
 \r
@@ -225,16 +227,16 @@ EFI_STATUS
 typedef\r
 VOID\r
 (EFIAPI *PCD_PPI_CALLBACK) (\r
-  IN  CONST EFI_GUID   *CallBackGuid, OPTIONAL\r
-  IN  UINTN            CallBackToken,\r
-  IN  VOID             *TokenData,\r
-  IN  UINTN            TokenDataSize\r
+  IN      CONST EFI_GUID   *CallBackGuid, OPTIONAL\r
+  IN      PCD_TOKEN_NUMBER CallBackToken,\r
+  IN  OUT VOID             *TokenData,\r
+  IN      UINTN            TokenDataSize\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_CALLBACK_ONSET) (\r
-  IN  UINTN                  TokenNumber,\r
+  IN  PCD_TOKEN_NUMBER       TokenNumber,\r
   IN  CONST EFI_GUID         *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK       CallBackFunction\r
   );\r
@@ -242,7 +244,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_CANCEL_CALLBACK) (\r
-  IN  UINTN                   TokenNumber,\r
+  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK        CallBackFunction\r
   );\r
@@ -251,7 +253,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_GET_NEXT_TOKEN) (\r
   IN CONST EFI_GUID           *Guid, OPTIONAL\r
-  IN OUT  UINTN               *TokenNumber\r
+  IN OUT  PCD_TOKEN_NUMBER    *TokenNumber\r
   );\r
 \r
 typedef struct {\r

diff --git a/MdePkg/Include/Protocol/Pcd.h b/MdePkg/Include/Protocol/Pcd.h
index ccdfd13647ca42be977995a43532bdbaa4403640..3adac6d4ab939b2903488aaf09b9fdd8440dd3cc 100644 (file)
--- a/MdePkg/Include/Protocol/Pcd.h
+++ b/MdePkg/Include/Protocol/Pcd.h
@@ -17,149 +17,150 @@
 #ifndef __PCD_H__\r
 #define __PCD_H__\r
 \r
+#include <Common/Pcd.h>\r
+\r
 extern EFI_GUID gPcdProtocolGuid;\r
 \r
 #define PCD_PROTOCOL_GUID \\r
   { 0x11b34006, 0xd85b, 0x4d0a, { 0xa2, 0x90, 0xd5, 0xa5, 0x71, 0x31, 0xe, 0xf7 } }\r
 \r
-typedef UINT8   SKU_ID;\r
-\r
 typedef \r
-EFI_STATUS\r
+VOID\r
 (EFIAPI *PCD_PROTOCOL_SET_SKU) (\r
-  IN  UINTN                  SkuId\r
+  IN  SKU_ID                  SkuId\r
   );\r
 \r
 typedef\r
 UINT8\r
 (EFIAPI *PCD_PROTOCOL_GET8) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT16\r
 (EFIAPI *PCD_PROTOCOL_GET16) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT32\r
 (EFIAPI *PCD_PROTOCOL_GET32) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT64\r
 (EFIAPI *PCD_PROTOCOL_GET64) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 VOID *\r
 (EFIAPI *PCD_PROTOCOL_GET_POINTER) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
 (EFIAPI *PCD_PROTOCOL_GET_BOOLEAN) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINTN\r
 (EFIAPI *PCD_PROTOCOL_GET_SIZE) (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT8\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_8) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT16\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_16) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT32\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_32) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINT64\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_64) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 VOID *\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_POINTER) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_BOOLEAN) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 UINTN\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_SIZE) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET8) (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT8             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET16) (\r
-  IN UINTN              TokenNumber,\r
+  IN PCD_TOKEN_NUMBER   TokenNumber,\r
   IN UINT16             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET32) (\r
-  IN UINTN              TokenNumber,\r
+  IN PCD_TOKEN_NUMBER   TokenNumber,\r
   IN UINT32             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET64) (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT64            Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_POINTER) (\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
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_BOOLEAN) (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN BOOLEAN           Value\r
   );\r
 \r
@@ -167,7 +168,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_8) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT8             Value\r
   );\r
 \r
@@ -175,7 +176,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_16) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT16            Value\r
   );\r
 \r
@@ -183,7 +184,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_32) (\r
   IN CONST EFI_GUID     *Guid,\r
-  IN UINTN              TokenNumber,\r
+  IN PCD_TOKEN_NUMBER   TokenNumber,\r
   IN UINT32             Value\r
   );\r
 \r
@@ -191,7 +192,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_64) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT64            Value\r
   );\r
 \r
@@ -199,15 +200,16 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_POINTER) (\r
   IN CONST EFI_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
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_BOOLEAN) (\r
   IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN BOOLEAN           Value\r
   );\r
   \r
@@ -225,16 +227,16 @@ EFI_STATUS
 typedef\r
 VOID\r
 (EFIAPI *PCD_PROTOCOL_CALLBACK) (\r
-  IN  CONST EFI_GUID   *CallBackGuid, OPTIONAL\r
-  IN  UINTN            CallBackToken,\r
-  IN  VOID             *TokenData,\r
-  IN  UINTN            TokenDataSize\r
+  IN      CONST EFI_GUID   *CallBackGuid, OPTIONAL\r
+  IN      PCD_TOKEN_NUMBER            CallBackToken,\r
+  IN  OUT VOID             *TokenData,\r
+  IN      UINTN            TokenDataSize\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_CALLBACK_ONSET) (\r
-  IN  UINTN                   TokenNumber,\r
+  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   );\r
@@ -242,7 +244,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_CANCEL_CALLBACK) (\r
-  IN  UINTN                   TokenNumber,\r
+  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   );\r
@@ -251,7 +253,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_GET_NEXT_TOKEN) (\r
   IN      CONST EFI_GUID      *Guid, OPTIONAL\r
-  IN OUT  UINTN               *TokenNumber\r
+  IN OUT  PCD_TOKEN_NUMBER    *TokenNumber\r
   );\r
 \r
 typedef struct {\r

diff --git a/MdePkg/Library/BasePcdLibNull/PcdLib.c b/MdePkg/Library/BasePcdLibNull/PcdLib.c
index 6c01017024b84103760450c084f1e8b21ef5c252..7b8dc50d5c58e04d5cd08b50ac87394bf943c9b7 100644 (file)
--- a/MdePkg/Library/BasePcdLibNull/PcdLib.c
+++ b/MdePkg/Library/BasePcdLibNull/PcdLib.c
@@ -22,13 +22,13 @@
   @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
   return SkuId;\r
@@ -47,7 +47,7 @@ LibPcdSetSku (
 UINT8\r
 EFIAPI\r
 LibPcdGet8 (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return 0;\r
@@ -66,7 +66,7 @@ LibPcdGet8 (
 UINT16\r
 EFIAPI\r
 LibPcdGet16 (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return 0;\r
@@ -85,7 +85,7 @@ LibPcdGet16 (
 UINT32\r
 EFIAPI\r
 LibPcdGet32 (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return 0;\r
@@ -104,7 +104,7 @@ LibPcdGet32 (
 UINT64\r
 EFIAPI\r
 LibPcdGet64 (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return 0;\r
@@ -123,7 +123,7 @@ LibPcdGet64 (
 VOID *\r
 EFIAPI\r
 LibPcdGetPtr (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return 0;\r
@@ -142,7 +142,7 @@ LibPcdGetPtr (
 BOOLEAN \r
 EFIAPI\r
 LibPcdGetBool (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return 0;\r
@@ -161,7 +161,7 @@ LibPcdGetBool (
 UINTN\r
 EFIAPI\r
 LibPcdGetSize (\r
-  IN UINTN  TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return 0;\r
@@ -184,7 +184,7 @@ UINT8
 EFIAPI\r
 LibPcdGetEx8 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -209,7 +209,7 @@ UINT16
 EFIAPI\r
 LibPcdGetEx16 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -234,7 +234,7 @@ UINT32
 EFIAPI\r
 LibPcdGetEx32 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -259,7 +259,7 @@ UINT64
 EFIAPI\r
 LibPcdGetEx64 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -284,7 +284,7 @@ VOID *
 EFIAPI\r
 LibPcdGetExPtr (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -309,7 +309,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdGetExBool (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -334,7 +334,7 @@ UINTN
 EFIAPI\r
 LibPcdGetExSize (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -357,7 +357,7 @@ LibPcdGetExSize (
 UINT8\r
 EFIAPI\r
 LibPcdSet8 (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT8             Value\r
   )\r
 {\r
@@ -379,7 +379,7 @@ LibPcdSet8 (
 UINT16\r
 EFIAPI\r
 LibPcdSet16 (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT16            Value\r
   )\r
 {\r
@@ -401,7 +401,7 @@ LibPcdSet16 (
 UINT32\r
 EFIAPI\r
 LibPcdSet32 (\r
-  IN UINTN              TokenNumber,\r
+  IN PCD_TOKEN_NUMBER   TokenNumber,\r
   IN UINT32             Value\r
   )\r
 {\r
@@ -423,7 +423,7 @@ LibPcdSet32 (
 UINT64\r
 EFIAPI\r
 LibPcdSet64 (\r
-  IN UINTN              TokenNumber,\r
+  IN PCD_TOKEN_NUMBER   TokenNumber,\r
   IN UINT64             Value\r
   )\r
 {\r
@@ -446,15 +446,14 @@ 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
-  ASSERT (Value != NULL);\r
-  //\r
-  // Remove the CONST\r
-  //\r
-  return (VOID *)Value;\r
+  ASSERT (Buffer != NULL);\r
+\r
+  return Buffer;\r
 }\r
 \r
 \r
@@ -472,7 +471,7 @@ LibPcdSetPtr (
 BOOLEAN\r
 EFIAPI\r
 LibPcdSetBool (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN BOOLEAN           Value\r
   )\r
 {\r
@@ -498,7 +497,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
@@ -526,7 +525,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
@@ -554,7 +553,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
@@ -582,7 +581,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
@@ -611,17 +610,15 @@ 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
-  //\r
-  // Remove the CONST\r
-  //\r
   ASSERT (Guid != NULL);\r
-  ASSERT (Value != NULL);\r
+  ASSERT (Buffer != NULL);\r
 \r
-  return (VOID *)Value;\r
+  return Buffer;\r
 }\r
 \r
 \r
@@ -643,7 +640,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
@@ -674,7 +671,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
@@ -698,7 +695,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
@@ -720,14 +717,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
   return 0;\r

diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.c b/MdePkg/Library/DxePcdLib/DxePcdLib.c
index 4773bf6c0cec2b0e505856434cab5a87fbb894a3..b4949d5d99e5e0171c230b36faf47a1cb2498ae0 100644 (file)
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.c
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.c
@@ -48,19 +48,16 @@ PcdLibConstructor (
   @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
-\r
-  Status = mPcd->SetSku (SkuId);\r
-  ASSERT_EFI_ERROR (Status);\r
+  mPcd->SetSku (SkuId);\r
 \r
   return SkuId;\r
 }\r
@@ -78,7 +75,7 @@ LibPcdSetSku (
 UINT8\r
 EFIAPI\r
 LibPcdGet8 (\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return mPcd->Get8 (TokenNumber);\r
@@ -97,7 +94,7 @@ LibPcdGet8 (
 UINT16\r
 EFIAPI\r
 LibPcdGet16 (\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return mPcd->Get16 (TokenNumber);\r
@@ -116,7 +113,7 @@ LibPcdGet16 (
 UINT32\r
 EFIAPI\r
 LibPcdGet32 (\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return mPcd->Get32 (TokenNumber);\r
@@ -135,7 +132,7 @@ LibPcdGet32 (
 UINT64\r
 EFIAPI\r
 LibPcdGet64 (\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return mPcd->Get64 (TokenNumber);\r
@@ -154,7 +151,7 @@ LibPcdGet64 (
 VOID *\r
 EFIAPI\r
 LibPcdGetPtr (\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return mPcd->GetPtr (TokenNumber);\r
@@ -173,7 +170,7 @@ LibPcdGetPtr (
 BOOLEAN \r
 EFIAPI\r
 LibPcdGetBool (\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return mPcd->GetBool (TokenNumber);\r
@@ -192,7 +189,7 @@ LibPcdGetBool (
 UINTN\r
 EFIAPI\r
 LibPcdGetSize (\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   return mPcd->GetSize (TokenNumber);\r
@@ -215,7 +212,7 @@ UINT8
 EFIAPI\r
 LibPcdGetEx8 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -239,7 +236,7 @@ UINT16
 EFIAPI\r
 LibPcdGetEx16 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -263,7 +260,7 @@ UINT32
 EFIAPI\r
 LibPcdGetEx32 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -288,7 +285,7 @@ UINT64
 EFIAPI\r
 LibPcdGetEx64 (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -313,7 +310,7 @@ VOID *
 EFIAPI\r
 LibPcdGetExPtr (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -338,7 +335,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdGetExBool (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -363,7 +360,7 @@ UINTN
 EFIAPI\r
 LibPcdGetExSize (\r
   IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
+  IN PCD_TOKEN_NUMBER  TokenNumber\r
   )\r
 {\r
   ASSERT (Guid != NULL);\r
@@ -386,7 +383,7 @@ LibPcdGetExSize (
 UINT8\r
 EFIAPI\r
 LibPcdSet8 (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT8             Value\r
   )\r
 {\r
@@ -414,7 +411,7 @@ LibPcdSet8 (
 UINT16\r
 EFIAPI\r
 LibPcdSet16 (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT16            Value\r
   )\r
 {\r
@@ -442,7 +439,7 @@ LibPcdSet16 (
 UINT32\r
 EFIAPI\r
 LibPcdSet32 (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT32             Value\r
   )\r
 {\r
@@ -469,7 +466,7 @@ LibPcdSet32 (
 UINT64\r
 EFIAPI\r
 LibPcdSet64 (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN UINT64             Value\r
   )\r
 {\r
@@ -498,19 +495,20 @@ 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
   \r
-  ASSERT (Value != NULL);\r
+  ASSERT (Buffer != NULL);\r
 \r
-  Status = mPcd->SetPtr (TokenNumber, Value);\r
+  Status = mPcd->SetPtr (TokenNumber, SizeOfBuffer, Buffer);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  return (VOID *)Value;\r
+  return Buffer;\r
 }\r
 \r
 \r
@@ -528,7 +526,7 @@ LibPcdSetPtr (
 BOOLEAN\r
 EFIAPI\r
 LibPcdSetBool (\r
-  IN UINTN             TokenNumber,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN BOOLEAN           Value\r
   )\r
 {\r
@@ -560,7 +558,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
@@ -594,7 +592,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
@@ -628,7 +626,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
@@ -662,7 +660,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
@@ -697,20 +695,21 @@ 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
 \r
   ASSERT (Guid != NULL);\r
-  ASSERT (Value != NULL);\r
+  ASSERT (Buffer != NULL);\r
 \r
-  Status = mPcd->SetPtrEx (Guid, TokenNumber, Value);\r
+  Status = mPcd->SetPtrEx (Guid, TokenNumber, SizeOfBuffer, Buffer);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  return (VOID *)Value;\r
+  return Buffer;\r
 }\r
 \r
 \r
@@ -732,7 +731,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
@@ -769,7 +768,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
@@ -801,7 +800,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
@@ -831,22 +830,22 @@ 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
 \r
-  Status = mPcd->GetNextToken (Guid, TokenNumber);\r
+  Status = mPcd->GetNextToken (Guid, &TokenNumber);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  return (*TokenNumber);\r
+  return TokenNumber;\r
 }\r
 \r

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