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

1) change all PCD_TOKEN_NUMBER to UINTN
2) change all SKU_ID to UINTN

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

MdePkg/Include/Library/PcdLib.h

@@ -18,8 +18,7 @@ Module Name: PcdLib.h
 #ifndef __PCD_LIB_H__
 #define __PCD_LIB_H__
 
-#include <Common/Pcd.h>
-
+#define PCD_INVALID_TOKEN_NUMBER ((UINTN) -1)
 
 #define PcdToken(TokenName)  _PCD_TOKEN_##TokenName
 
@@ -93,7 +92,7 @@ Module Name: PcdLib.h
 #define PcdSet16(TokenName, Value)      LibPcdSet16  (_PCD_TOKEN_##TokenName, Value)
 #define PcdSet32(TokenName, Value)      LibPcdSet32  (_PCD_TOKEN_##TokenName, Value)
 #define PcdSet64(TokenName, Value)      LibPcdSet64  (_PCD_TOKEN_##TokenName, Value)
-#define PcdSetPtr(TokenName, Value)     LibPcdSetPtr (_PCD_TOKEN_##TokenName, Value)
+#define PcdSetPtr(TokenName, SizeOfBuffer, Buffer)     LibPcdSetPtr (_PCD_TOKEN_##TokenName, SizeOfBuffer, Buffer)
 #define PcdSetBool(TokenName, Value)    LibPcdSetBool(_PCD_TOKEN_##TokenName, Value)
 
 
@@ -104,7 +103,7 @@ Module Name: PcdLib.h
 #define PcdSetEx16(Guid, TokenName, Value)     LibPcdSetEx16  (Guid, _PCD_TOKEN_##TokenName, Value)
 #define PcdSetEx32(Guid, TokenName, Value)     LibPcdSetEx32  (Guid, _PCD_TOKEN_##TokenName, Value)
 #define PcdSetEx64(Guid, TokenName, Value)     LibPcdSetEx64  (Guid, _PCD_TOKEN_##TokenName, Value)
-#define PcdSetExPtr(Guid, TokenName, Value)    LibPcdSetExPtr (Guid, _PCD_TOKEN_##TokenName, Value)
+#define PcdSetExPtr(Guid, TokenName, SizeOfBuffer, Buffer)    LibPcdSetExPtr (Guid, _PCD_TOKEN_##TokenName, SizeOfBuffer, Buffer)
 #define PcdSetExBool(Guid, TokenName, Value)   LibPcdSetExBool(Guid, _PCD_TOKEN_##TokenName, Value)
 
 
@@ -117,10 +116,10 @@ Module Name: PcdLib.h
   @retval SKU_ID Return the SKU ID that just be set.
 
 **/
-SKU_ID
+UINTN
 EFIAPI
 LibPcdSetSku (
-  IN SKU_ID   SkuId
+  IN UINTN   SkuId
   );
 
 
@@ -135,7 +134,7 @@ LibPcdSetSku (
 UINT8
 EFIAPI
 LibPcdGet8 (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 
@@ -150,7 +149,7 @@ LibPcdGet8 (
 UINT16
 EFIAPI
 LibPcdGet16 (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 
@@ -165,7 +164,7 @@ LibPcdGet16 (
 UINT32
 EFIAPI
 LibPcdGet32 (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 
@@ -180,7 +179,7 @@ LibPcdGet32 (
 UINT64
 EFIAPI
 LibPcdGet64 (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 
@@ -195,7 +194,7 @@ LibPcdGet64 (
 VOID *
 EFIAPI
 LibPcdGetPtr (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 
@@ -210,7 +209,7 @@ LibPcdGetPtr (
 BOOLEAN 
 EFIAPI
 LibPcdGetBool (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 
@@ -225,7 +224,7 @@ LibPcdGetBool (
 UINTN
 EFIAPI
 LibPcdGetSize (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 
@@ -244,7 +243,7 @@ UINT8
 EFIAPI
 LibPcdGetEx8 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 
@@ -263,7 +262,7 @@ UINT16
 EFIAPI
 LibPcdGetEx16 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 
@@ -282,7 +281,7 @@ UINT32
 EFIAPI
 LibPcdGetEx32 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 
@@ -301,7 +300,7 @@ UINT64
 EFIAPI
 LibPcdGetEx64 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 
@@ -320,7 +319,7 @@ VOID *
 EFIAPI
 LibPcdGetExPtr (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 
@@ -339,7 +338,7 @@ BOOLEAN
 EFIAPI
 LibPcdGetExBool (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 
@@ -358,7 +357,7 @@ UINTN
 EFIAPI
 LibPcdGetExSize (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 
@@ -375,7 +374,7 @@ LibPcdGetExSize (
 UINT8
 EFIAPI
 LibPcdSet8 (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT8             Value
   );
 
@@ -393,7 +392,7 @@ LibPcdSet8 (
 UINT16
 EFIAPI
 LibPcdSet16 (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT16            Value
   );
 
@@ -411,7 +410,7 @@ LibPcdSet16 (
 UINT32
 EFIAPI
 LibPcdSet32 (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT32            Value
   );
 
@@ -429,7 +428,7 @@ LibPcdSet32 (
 UINT64
 EFIAPI
 LibPcdSet64 (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT64            Value
   );
 
@@ -448,7 +447,7 @@ LibPcdSet64 (
 VOID*
 EFIAPI
 LibPcdSetPtr (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINTN             SizeOfBuffer,
   IN VOID              *Value
   );
@@ -467,7 +466,7 @@ LibPcdSetPtr (
 BOOLEAN
 EFIAPI
 LibPcdSetBool (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN BOOLEAN           Value
   );
 
@@ -489,7 +488,7 @@ UINT8
 EFIAPI
 LibPcdSetEx8 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT8             Value
   );
 
@@ -511,7 +510,7 @@ UINT16
 EFIAPI
 LibPcdSetEx16 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT16            Value
   );
 
@@ -533,7 +532,7 @@ UINT32
 EFIAPI
 LibPcdSetEx32 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT32            Value
   );
 
@@ -555,7 +554,7 @@ UINT64
 EFIAPI
 LibPcdSetEx64 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT64            Value
   );
 
@@ -578,7 +577,7 @@ VOID *
 EFIAPI
 LibPcdSetExPtr (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINTN             SizeOfBuffer,
   IN VOID              *Value
   );
@@ -601,7 +600,7 @@ BOOLEAN
 EFIAPI
 LibPcdSetExBool (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN BOOLEAN           Value
   );
 
@@ -624,7 +623,7 @@ typedef
 VOID
 (EFIAPI *PCD_CALLBACK) (
   IN        CONST GUID        *CallBackGuid, OPTIONAL
-  IN        PCD_TOKEN_NUMBER  CallBackToken,
+  IN        UINTN             CallBackToken,
   IN  OUT   VOID              *TokenData,
   IN        UINTN             TokenDataSize
   );
@@ -650,7 +649,7 @@ VOID
 EFIAPI
 LibPcdCallbackOnSet (
   IN CONST GUID               *Guid,       OPTIONAL
-  IN PCD_TOKEN_NUMBER         TokenNumber,
+  IN UINTN                    TokenNumber,
   IN PCD_CALLBACK             NotificationFunction
   );
 
@@ -669,7 +668,7 @@ VOID
 EFIAPI
 LibPcdCancelCallback (
   IN CONST GUID               *Guid,       OPTIONAL
-  IN PCD_TOKEN_NUMBER         TokenNumber,
+  IN UINTN                    TokenNumber,
   IN PCD_CALLBACK             NotificationFunction
   );
 
@@ -687,14 +686,14 @@ LibPcdCancelCallback (
   @param[in]  The previous PCD token number.  If 0, then retrieves the first PCD 
               token number.
 
-  @retval PCD_TOKEN_NUMBER The next valid token number.
+  @retval UINTN            The next valid token number.
 
 **/
-PCD_TOKEN_NUMBER
+UINTN           
 EFIAPI
 LibPcdGetNextToken (
   IN CONST GUID               *Guid,       OPTIONAL
-  IN PCD_TOKEN_NUMBER         TokenNumber
+  IN UINTN                    TokenNumber
   );
 
 #endif

MdePkg/Include/Ppi/Pcd.h

@@ -17,142 +17,142 @@
 #ifndef __PCD_H__
 #define __PCD_H__
 
-#include <Common/Pcd.h>
-
 extern EFI_GUID gPcdPpiGuid;
 
 #define PCD_PPI_GUID \
   { 0x632df884, 0x8023, 0x4872, { 0xb6, 0x70, 0xb7, 0x4a, 0x30, 0x19, 0x16, 0xe9 } }
 
+#define PCD_INVALID_TOKEN_NUMBER ((UINTN) -1)
+
 typedef 
 VOID
 (EFIAPI *PCD_PPI_SET_SKU) (
-  IN  SKU_ID          SkuId
+  IN  UINTN          SkuId
   );
 
 typedef
 UINT8
 (EFIAPI *PCD_PPI_GET8) (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINT16
 (EFIAPI *PCD_PPI_GET16) (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINT32
 (EFIAPI *PCD_PPI_GET32) (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINT64
 (EFIAPI *PCD_PPI_GET64) (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 VOID *
 (EFIAPI *PCD_PPI_GET_POINTER) (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 BOOLEAN
 (EFIAPI *PCD_PPI_GET_BOOLEAN) (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINTN
 (EFIAPI *PCD_PPI_GET_SIZE) (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINT8
 (EFIAPI *PCD_PPI_GET_EX_8) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINT16
 (EFIAPI *PCD_PPI_GET_EX_16) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER   TokenNumber
+  IN UINTN              TokenNumber
   );
 
 typedef
 UINT32
 (EFIAPI *PCD_PPI_GET_EX_32) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINT64
 (EFIAPI *PCD_PPI_GET_EX_64) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 VOID *
 (EFIAPI *PCD_PPI_GET_EX_POINTER) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 BOOLEAN
 (EFIAPI *PCD_PPI_GET_EX_BOOLEAN) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINTN
 (EFIAPI *PCD_PPI_GET_EX_SIZE) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 EFI_STATUS
 (EFIAPI *PCD_PPI_SET8) (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT8             Value
   );
 
 typedef
 EFI_STATUS
 (EFIAPI *PCD_PPI_SET16) (
-  IN PCD_TOKEN_NUMBER   TokenNumber,
+  IN UINTN              TokenNumber,
   IN UINT16             Value
   );
 
 typedef
 EFI_STATUS
 (EFIAPI *PCD_PPI_SET32) (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT32            Value
   );
 
 typedef
 EFI_STATUS
 (EFIAPI *PCD_PPI_SET64) (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT64            Value
   );
 
 typedef
 EFI_STATUS
 (EFIAPI *PCD_PPI_SET_POINTER) (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINTN             SizeOfBuffer,
   IN VOID              *Buffer
   );
@@ -160,7 +160,7 @@ EFI_STATUS
 typedef
 EFI_STATUS
 (EFIAPI *PCD_PPI_SET_BOOLEAN) (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN BOOLEAN           Value
   );
 
@@ -168,7 +168,7 @@ typedef
 EFI_STATUS
 (EFIAPI *PCD_PPI_SET_EX_8) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT8             Value
   );
 
@@ -176,7 +176,7 @@ typedef
 EFI_STATUS
 (EFIAPI *PCD_PPI_SET_EX_16) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT16            Value
   );
 
@@ -184,7 +184,7 @@ typedef
 EFI_STATUS
 (EFIAPI *PCD_PPI_SET_EX_32) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT32            Value
   );
 
@@ -192,7 +192,7 @@ typedef
 EFI_STATUS
 (EFIAPI *PCD_PPI_SET_EX_64) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT64            Value
   );
 
@@ -200,7 +200,7 @@ typedef
 EFI_STATUS
 (EFIAPI *PCD_PPI_SET_EX_POINTER) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINTN             SizeOfBuffer,
   IN VOID              *Buffer
   );
@@ -209,7 +209,7 @@ typedef
 EFI_STATUS
 (EFIAPI *PCD_PPI_SET_EX_BOOLEAN) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN BOOLEAN           Value
   );
 
@@ -228,7 +228,7 @@ typedef
 VOID
 (EFIAPI *PCD_PPI_CALLBACK) (
   IN      CONST EFI_GUID   *CallBackGuid, OPTIONAL
-  IN      PCD_TOKEN_NUMBER CallBackToken,
+  IN      UINTN            CallBackToken,
   IN  OUT VOID             *TokenData,
   IN      UINTN            TokenDataSize
   );
@@ -236,7 +236,7 @@ VOID
 typedef
 EFI_STATUS
 (EFIAPI *PCD_PPI_CALLBACK_ONSET) (
-  IN  PCD_TOKEN_NUMBER       TokenNumber,
+  IN  UINTN                  TokenNumber,
   IN  CONST EFI_GUID         *Guid, OPTIONAL
   IN  PCD_PPI_CALLBACK       CallBackFunction
   );
@@ -244,7 +244,7 @@ EFI_STATUS
 typedef
 EFI_STATUS
 (EFIAPI *PCD_PPI_CANCEL_CALLBACK) (
-  IN  PCD_TOKEN_NUMBER        TokenNumber,
+  IN  UINTN                   TokenNumber,
   IN  CONST EFI_GUID          *Guid, OPTIONAL
   IN  PCD_PPI_CALLBACK        CallBackFunction
   );
@@ -253,7 +253,7 @@ typedef
 EFI_STATUS
 (EFIAPI *PCD_PPI_GET_NEXT_TOKEN) (
   IN CONST EFI_GUID           *Guid, OPTIONAL
-  IN OUT  PCD_TOKEN_NUMBER    *TokenNumber
+  IN OUT  UINTN               *TokenNumber
   );
 
 typedef struct {

MdePkg/Include/Protocol/Pcd.h

@@ -17,142 +17,142 @@
 #ifndef __PCD_H__
 #define __PCD_H__
 
-#include <Common/Pcd.h>
-
 extern EFI_GUID gPcdProtocolGuid;
 
 #define PCD_PROTOCOL_GUID \
   { 0x11b34006, 0xd85b, 0x4d0a, { 0xa2, 0x90, 0xd5, 0xa5, 0x71, 0x31, 0xe, 0xf7 } }
 
+#define PCD_INVALID_TOKEN_NUMBER ((UINTN) -1)
+
 typedef 
 VOID
 (EFIAPI *PCD_PROTOCOL_SET_SKU) (
-  IN  SKU_ID                  SkuId
+  IN  UINTN                  SkuId
   );
 
 typedef
 UINT8
 (EFIAPI *PCD_PROTOCOL_GET8) (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINT16
 (EFIAPI *PCD_PROTOCOL_GET16) (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINT32
 (EFIAPI *PCD_PROTOCOL_GET32) (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINT64
 (EFIAPI *PCD_PROTOCOL_GET64) (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 VOID *
 (EFIAPI *PCD_PROTOCOL_GET_POINTER) (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 BOOLEAN
 (EFIAPI *PCD_PROTOCOL_GET_BOOLEAN) (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINTN
 (EFIAPI *PCD_PROTOCOL_GET_SIZE) (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINT8
 (EFIAPI *PCD_PROTOCOL_GET_EX_8) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINT16
 (EFIAPI *PCD_PROTOCOL_GET_EX_16) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINT32
 (EFIAPI *PCD_PROTOCOL_GET_EX_32) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINT64
 (EFIAPI *PCD_PROTOCOL_GET_EX_64) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 VOID *
 (EFIAPI *PCD_PROTOCOL_GET_EX_POINTER) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 BOOLEAN
 (EFIAPI *PCD_PROTOCOL_GET_EX_BOOLEAN) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 UINTN
 (EFIAPI *PCD_PROTOCOL_GET_EX_SIZE) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   );
 
 typedef
 EFI_STATUS
 (EFIAPI *PCD_PROTOCOL_SET8) (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT8             Value
   );
 
 typedef
 EFI_STATUS
 (EFIAPI *PCD_PROTOCOL_SET16) (
-  IN PCD_TOKEN_NUMBER   TokenNumber,
+  IN UINTN              TokenNumber,
   IN UINT16             Value
   );
 
 typedef
 EFI_STATUS
 (EFIAPI *PCD_PROTOCOL_SET32) (
-  IN PCD_TOKEN_NUMBER   TokenNumber,
+  IN UINTN              TokenNumber,
   IN UINT32             Value
   );
 
 typedef
 EFI_STATUS
 (EFIAPI *PCD_PROTOCOL_SET64) (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT64            Value
   );
 
 typedef
 EFI_STATUS
 (EFIAPI *PCD_PROTOCOL_SET_POINTER) (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINTN             SizeOfBuffer,
   IN VOID              *Buffer
   );
@@ -160,7 +160,7 @@ EFI_STATUS
 typedef
 EFI_STATUS
 (EFIAPI *PCD_PROTOCOL_SET_BOOLEAN) (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN BOOLEAN           Value
   );
 
@@ -168,7 +168,7 @@ typedef
 EFI_STATUS
 (EFIAPI *PCD_PROTOCOL_SET_EX_8) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT8             Value
   );
 
@@ -176,7 +176,7 @@ typedef
 EFI_STATUS
 (EFIAPI *PCD_PROTOCOL_SET_EX_16) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT16            Value
   );
 
@@ -184,7 +184,7 @@ typedef
 EFI_STATUS
 (EFIAPI *PCD_PROTOCOL_SET_EX_32) (
   IN CONST EFI_GUID     *Guid,
-  IN PCD_TOKEN_NUMBER   TokenNumber,
+  IN UINTN              TokenNumber,
   IN UINT32             Value
   );
 
@@ -192,7 +192,7 @@ typedef
 EFI_STATUS
 (EFIAPI *PCD_PROTOCOL_SET_EX_64) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT64            Value
   );
 
@@ -200,7 +200,7 @@ typedef
 EFI_STATUS
 (EFIAPI *PCD_PROTOCOL_SET_EX_POINTER) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINTN             SizeOfBuffer,
   IN VOID              *Buffer
   );
@@ -209,7 +209,7 @@ typedef
 EFI_STATUS
 (EFIAPI *PCD_PROTOCOL_SET_EX_BOOLEAN) (
   IN CONST EFI_GUID    *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN BOOLEAN           Value
   );
   
@@ -228,7 +228,7 @@ typedef
 VOID
 (EFIAPI *PCD_PROTOCOL_CALLBACK) (
   IN      CONST EFI_GUID   *CallBackGuid, OPTIONAL
-  IN      PCD_TOKEN_NUMBER            CallBackToken,
+  IN      UINTN                       CallBackToken,
   IN  OUT VOID             *TokenData,
   IN      UINTN            TokenDataSize
   );
@@ -236,7 +236,7 @@ VOID
 typedef
 EFI_STATUS
 (EFIAPI *PCD_PROTOCOL_CALLBACK_ONSET) (
-  IN  PCD_TOKEN_NUMBER        TokenNumber,
+  IN  UINTN                   TokenNumber,
   IN  CONST EFI_GUID          *Guid, OPTIONAL
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction
   );
@@ -244,7 +244,7 @@ EFI_STATUS
 typedef
 EFI_STATUS
 (EFIAPI *PCD_PROTOCOL_CANCEL_CALLBACK) (
-  IN  PCD_TOKEN_NUMBER        TokenNumber,
+  IN  UINTN                   TokenNumber,
   IN  CONST EFI_GUID          *Guid, OPTIONAL
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction
   );
@@ -253,7 +253,7 @@ typedef
 EFI_STATUS
 (EFIAPI *PCD_PROTOCOL_GET_NEXT_TOKEN) (
   IN      CONST EFI_GUID      *Guid, OPTIONAL
-  IN OUT  PCD_TOKEN_NUMBER    *TokenNumber
+  IN OUT  UINTN               *TokenNumber
   );
 
 typedef struct {

MdePkg/Library/BasePcdLibNull/PcdLib.c

@@ -25,10 +25,10 @@
   @retval SKU_ID Return the SKU ID that just be set.
 
 **/
-SKU_ID
+UINTN           
 EFIAPI
 LibPcdSetSku (
-  IN SKU_ID  SkuId
+  IN UINTN  SkuId
   )
 {
   return SkuId;
@@ -47,7 +47,7 @@ LibPcdSetSku (
 UINT8
 EFIAPI
 LibPcdGet8 (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   return 0;
@@ -66,7 +66,7 @@ LibPcdGet8 (
 UINT16
 EFIAPI
 LibPcdGet16 (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   return 0;
@@ -85,7 +85,7 @@ LibPcdGet16 (
 UINT32
 EFIAPI
 LibPcdGet32 (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   return 0;
@@ -104,7 +104,7 @@ LibPcdGet32 (
 UINT64
 EFIAPI
 LibPcdGet64 (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   return 0;
@@ -123,7 +123,7 @@ LibPcdGet64 (
 VOID *
 EFIAPI
 LibPcdGetPtr (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   return 0;
@@ -142,7 +142,7 @@ LibPcdGetPtr (
 BOOLEAN 
 EFIAPI
 LibPcdGetBool (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   return 0;
@@ -161,7 +161,7 @@ LibPcdGetBool (
 UINTN
 EFIAPI
 LibPcdGetSize (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   return 0;
@@ -184,7 +184,7 @@ UINT8
 EFIAPI
 LibPcdGetEx8 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   ASSERT (Guid != NULL);
@@ -209,7 +209,7 @@ UINT16
 EFIAPI
 LibPcdGetEx16 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   ASSERT (Guid != NULL);
@@ -234,7 +234,7 @@ UINT32
 EFIAPI
 LibPcdGetEx32 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   ASSERT (Guid != NULL);
@@ -259,7 +259,7 @@ UINT64
 EFIAPI
 LibPcdGetEx64 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   ASSERT (Guid != NULL);
@@ -284,7 +284,7 @@ VOID *
 EFIAPI
 LibPcdGetExPtr (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   ASSERT (Guid != NULL);
@@ -309,7 +309,7 @@ BOOLEAN
 EFIAPI
 LibPcdGetExBool (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   ASSERT (Guid != NULL);
@@ -334,7 +334,7 @@ UINTN
 EFIAPI
 LibPcdGetExSize (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   ASSERT (Guid != NULL);
@@ -357,7 +357,7 @@ LibPcdGetExSize (
 UINT8
 EFIAPI
 LibPcdSet8 (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT8             Value
   )
 {
@@ -379,7 +379,7 @@ LibPcdSet8 (
 UINT16
 EFIAPI
 LibPcdSet16 (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT16            Value
   )
 {
@@ -401,7 +401,7 @@ LibPcdSet16 (
 UINT32
 EFIAPI
 LibPcdSet32 (
-  IN PCD_TOKEN_NUMBER   TokenNumber,
+  IN UINTN              TokenNumber,
   IN UINT32             Value
   )
 {
@@ -423,7 +423,7 @@ LibPcdSet32 (
 UINT64
 EFIAPI
 LibPcdSet64 (
-  IN PCD_TOKEN_NUMBER   TokenNumber,
+  IN UINTN              TokenNumber,
   IN UINT64             Value
   )
 {
@@ -446,7 +446,7 @@ LibPcdSet64 (
 VOID *
 EFIAPI
 LibPcdSetPtr (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINTN             SizeOfBuffer,
   IN VOID              *Buffer
   )
@@ -471,7 +471,7 @@ LibPcdSetPtr (
 BOOLEAN
 EFIAPI
 LibPcdSetBool (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN BOOLEAN           Value
   )
 {
@@ -497,7 +497,7 @@ UINT8
 EFIAPI
 LibPcdSetEx8 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT8             Value
   )
 {
@@ -525,7 +525,7 @@ UINT16
 EFIAPI
 LibPcdSetEx16 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT16            Value
   )
 {
@@ -553,7 +553,7 @@ UINT32
 EFIAPI
 LibPcdSetEx32 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT32            Value
   )
 {
@@ -581,7 +581,7 @@ UINT64
 EFIAPI
 LibPcdSetEx64 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT64            Value
   )
 {
@@ -610,7 +610,7 @@ VOID *
 EFIAPI
 LibPcdSetExPtr (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINTN             SizeOfBuffer,
   IN VOID              *Buffer
   )
@@ -640,7 +640,7 @@ BOOLEAN
 EFIAPI
 LibPcdSetExBool (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN BOOLEAN           Value
   )
 {
@@ -671,7 +671,7 @@ VOID
 EFIAPI
 LibPcdCallbackOnSet (
   IN CONST GUID               *Guid,       OPTIONAL
-  IN PCD_TOKEN_NUMBER         TokenNumber,
+  IN UINTN                    TokenNumber,
   IN PCD_CALLBACK             NotificationFunction
   )
 {
@@ -695,7 +695,7 @@ VOID
 EFIAPI
 LibPcdCancelCallback (
   IN CONST GUID               *Guid,       OPTIONAL
-  IN PCD_TOKEN_NUMBER         TokenNumber,
+  IN UINTN                    TokenNumber,
   IN PCD_CALLBACK             NotificationFunction
   )
 {
@@ -717,14 +717,14 @@ LibPcdCancelCallback (
   @param[in]  The previous PCD token number.  If 0, then retrieves the first PCD 
               token number.
 
-  @retval PCD_TOKEN_NUMBER The next valid token number.
+  @retval UINTN            The next valid token number.
 
 **/
-PCD_TOKEN_NUMBER
+UINTN           
 EFIAPI
 LibPcdGetNextToken (
   IN CONST GUID               *Guid, OPTIONAL
-  IN       PCD_TOKEN_NUMBER   TokenNumber
+  IN       UINTN              TokenNumber
   )
 {
   return 0;

MdePkg/Library/DxePcdLib/DxePcdLib.c

@@ -51,10 +51,10 @@ PcdLibConstructor (
   @retval SKU_ID Return the SKU ID that just be set.
 
 **/
-SKU_ID
+UINTN
 EFIAPI
 LibPcdSetSku (
-  IN SKU_ID  SkuId
+  IN UINTN  SkuId
   )
 {
   mPcd->SetSku (SkuId);
@@ -75,7 +75,7 @@ LibPcdSetSku (
 UINT8
 EFIAPI
 LibPcdGet8 (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   return mPcd->Get8 (TokenNumber);
@@ -94,7 +94,7 @@ LibPcdGet8 (
 UINT16
 EFIAPI
 LibPcdGet16 (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   return mPcd->Get16 (TokenNumber);
@@ -113,7 +113,7 @@ LibPcdGet16 (
 UINT32
 EFIAPI
 LibPcdGet32 (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   return mPcd->Get32 (TokenNumber);
@@ -132,7 +132,7 @@ LibPcdGet32 (
 UINT64
 EFIAPI
 LibPcdGet64 (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   return mPcd->Get64 (TokenNumber);
@@ -151,7 +151,7 @@ LibPcdGet64 (
 VOID *
 EFIAPI
 LibPcdGetPtr (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   return mPcd->GetPtr (TokenNumber);
@@ -170,7 +170,7 @@ LibPcdGetPtr (
 BOOLEAN 
 EFIAPI
 LibPcdGetBool (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   return mPcd->GetBool (TokenNumber);
@@ -189,7 +189,7 @@ LibPcdGetBool (
 UINTN
 EFIAPI
 LibPcdGetSize (
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   return mPcd->GetSize (TokenNumber);
@@ -212,7 +212,7 @@ UINT8
 EFIAPI
 LibPcdGetEx8 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   ASSERT (Guid != NULL);
@@ -236,7 +236,7 @@ UINT16
 EFIAPI
 LibPcdGetEx16 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   ASSERT (Guid != NULL);
@@ -260,7 +260,7 @@ UINT32
 EFIAPI
 LibPcdGetEx32 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   ASSERT (Guid != NULL);
@@ -285,7 +285,7 @@ UINT64
 EFIAPI
 LibPcdGetEx64 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   ASSERT (Guid != NULL);
@@ -310,7 +310,7 @@ VOID *
 EFIAPI
 LibPcdGetExPtr (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   ASSERT (Guid != NULL);
@@ -335,7 +335,7 @@ BOOLEAN
 EFIAPI
 LibPcdGetExBool (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   ASSERT (Guid != NULL);
@@ -360,7 +360,7 @@ UINTN
 EFIAPI
 LibPcdGetExSize (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber
+  IN UINTN             TokenNumber
   )
 {
   ASSERT (Guid != NULL);
@@ -383,7 +383,7 @@ LibPcdGetExSize (
 UINT8
 EFIAPI
 LibPcdSet8 (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT8             Value
   )
 {
@@ -411,7 +411,7 @@ LibPcdSet8 (
 UINT16
 EFIAPI
 LibPcdSet16 (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT16            Value
   )
 {
@@ -439,7 +439,7 @@ LibPcdSet16 (
 UINT32
 EFIAPI
 LibPcdSet32 (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT32             Value
   )
 {
@@ -466,7 +466,7 @@ LibPcdSet32 (
 UINT64
 EFIAPI
 LibPcdSet64 (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT64             Value
   )
 {
@@ -495,7 +495,7 @@ LibPcdSet64 (
 VOID *
 EFIAPI
 LibPcdSetPtr (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINTN             SizeOfBuffer,
   IN VOID              *Buffer
   )
@@ -526,7 +526,7 @@ LibPcdSetPtr (
 BOOLEAN
 EFIAPI
 LibPcdSetBool (
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN BOOLEAN           Value
   )
 {
@@ -558,7 +558,7 @@ UINT8
 EFIAPI
 LibPcdSetEx8 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT8             Value
   )
 {
@@ -592,7 +592,7 @@ UINT16
 EFIAPI
 LibPcdSetEx16 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT16            Value
   )
 {
@@ -626,7 +626,7 @@ UINT32
 EFIAPI
 LibPcdSetEx32 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT32             Value
   )
 {
@@ -660,7 +660,7 @@ UINT64
 EFIAPI
 LibPcdSetEx64 (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINT64             Value
   )
 {
@@ -695,7 +695,7 @@ VOID *
 EFIAPI
 LibPcdSetExPtr (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN UINTN             SizeOfBuffer,
   IN VOID              *Buffer
   )
@@ -731,7 +731,7 @@ BOOLEAN
 EFIAPI
 LibPcdSetExBool (
   IN CONST GUID        *Guid,
-  IN PCD_TOKEN_NUMBER  TokenNumber,
+  IN UINTN             TokenNumber,
   IN BOOLEAN           Value
   )
 {
@@ -768,7 +768,7 @@ VOID
 EFIAPI
 LibPcdCallbackOnSet (
   IN CONST GUID               *Guid,       OPTIONAL
-  IN PCD_TOKEN_NUMBER         TokenNumber,
+  IN UINTN                    TokenNumber,
   IN PCD_CALLBACK             NotificationFunction
   )
 {
@@ -800,7 +800,7 @@ VOID
 EFIAPI
 LibPcdCancelCallback (
   IN CONST GUID               *Guid,       OPTIONAL
-  IN PCD_TOKEN_NUMBER         TokenNumber,
+  IN UINTN                    TokenNumber,
   IN PCD_CALLBACK             NotificationFunction
   )
 {
@@ -830,14 +830,14 @@ LibPcdCancelCallback (
   @param[in]  The previous PCD token number.  If 0, then retrieves the first PCD 
               token number.
 
-  @retval PCD_TOKEN_NUMBER The next valid token number.
+  @retval UINTN            The next valid token number.
 
 **/
-PCD_TOKEN_NUMBER           
+UINTN                      
 EFIAPI
 LibPcdGetNextToken (
   IN CONST GUID             *Guid, OPTIONAL
-  IN       PCD_TOKEN_NUMBER TokenNumber
+  IN       UINTN            TokenNumber
   )
 {
   EFI_STATUS Status;

MdePkg/Library/PeiPcdLib/PeiPcdLib.c

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