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

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
index 64191a7161a64908148e6e64a3cbc5788c814d60..ffb62256c3b5b781eab35949b8aa74e130e22185 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -100,10 +100,10 @@ PcdDxeInit (
 VOID\r
 EFIAPI\r
 DxePcdSetSku (\r
 VOID\r
 EFIAPI\r
 DxePcdSetSku (\r

-  IN  SKU_ID         SkuId\r
+  IN  UINTN         SkuId\r

   )\r
 {\r
   )\r
 {\r

-  mPcdDatabase->PeiDb.Init.SystemSkuId = SkuId;\r
+  mPcdDatabase->PeiDb.Init.SystemSkuId = (SKU_ID) SkuId;\r

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


@@ -113,7 +113,7 @@ DxePcdSetSku (
 UINT8\r
 EFIAPI\r
 DxePcdGet8 (\r
 UINT8\r
 EFIAPI\r
 DxePcdGet8 (\r

-  IN PCD_TOKEN_NUMBER         TokenNumber\r
+  IN UINTN                    TokenNumber\r

   )\r
 {\r
   return *((UINT8 *) GetWorker (TokenNumber, sizeof (UINT8)));\r
   )\r
 {\r
   return *((UINT8 *) GetWorker (TokenNumber, sizeof (UINT8)));\r


@@ -124,7 +124,7 @@ DxePcdGet8 (
 UINT16\r
 EFIAPI\r
 DxePcdGet16 (\r
 UINT16\r
 EFIAPI\r
 DxePcdGet16 (\r

-  IN PCD_TOKEN_NUMBER         TokenNumber\r
+  IN UINTN                    TokenNumber\r

   )\r
 {\r
   return ReadUnaligned16 (GetWorker (TokenNumber, sizeof (UINT16)));\r
   )\r
 {\r
   return ReadUnaligned16 (GetWorker (TokenNumber, sizeof (UINT16)));\r


@@ -135,7 +135,7 @@ DxePcdGet16 (
 UINT32\r
 EFIAPI\r
 DxePcdGet32 (\r
 UINT32\r
 EFIAPI\r
 DxePcdGet32 (\r

-  IN PCD_TOKEN_NUMBER         TokenNumber\r
+  IN UINTN                    TokenNumber\r

   )\r
 {\r
   return ReadUnaligned32 (GetWorker (TokenNumber, sizeof (UINT32)));\r
   )\r
 {\r
   return ReadUnaligned32 (GetWorker (TokenNumber, sizeof (UINT32)));\r


@@ -146,7 +146,7 @@ DxePcdGet32 (
 UINT64\r
 EFIAPI\r
 DxePcdGet64 (\r
 UINT64\r
 EFIAPI\r
 DxePcdGet64 (\r

-  IN PCD_TOKEN_NUMBER          TokenNumber\r
+  IN UINTN                     TokenNumber\r

   )\r
 {\r
   return ReadUnaligned64(GetWorker (TokenNumber, sizeof (UINT64)));\r
   )\r
 {\r
   return ReadUnaligned64(GetWorker (TokenNumber, sizeof (UINT64)));\r


@@ -157,7 +157,7 @@ DxePcdGet64 (
 VOID *\r
 EFIAPI\r
 DxePcdGetPtr (\r
 VOID *\r
 EFIAPI\r
 DxePcdGetPtr (\r

-  IN PCD_TOKEN_NUMBER          TokenNumber\r
+  IN UINTN                     TokenNumber\r

   )\r
 {\r
   return GetWorker (TokenNumber, 0);\r
   )\r
 {\r
   return GetWorker (TokenNumber, 0);\r


@@ -168,7 +168,7 @@ DxePcdGetPtr (
 BOOLEAN\r
 EFIAPI\r
 DxePcdGetBool (\r
 BOOLEAN\r
 EFIAPI\r
 DxePcdGetBool (\r

-  IN PCD_TOKEN_NUMBER          TokenNumber\r
+  IN UINTN                     TokenNumber\r

   )\r
 {\r
   return *((BOOLEAN *) GetWorker (TokenNumber, sizeof (BOOLEAN)));\r
   )\r
 {\r
   return *((BOOLEAN *) GetWorker (TokenNumber, sizeof (BOOLEAN)));\r


@@ -179,7 +179,7 @@ DxePcdGetBool (
 UINTN\r
 EFIAPI\r
 DxePcdGetSize (\r
 UINTN\r
 EFIAPI\r
 DxePcdGetSize (\r

-  IN PCD_TOKEN_NUMBER          TokenNumber\r
+  IN UINTN                     TokenNumber\r

   )\r
 {\r
   UINT16 * SizeTable;\r
   )\r
 {\r
   UINT16 * SizeTable;\r


@@ -199,7 +199,7 @@ UINT8
 EFIAPI\r
 DxePcdGet8Ex (\r
   IN CONST EFI_GUID         *Guid,\r
 EFIAPI\r
 DxePcdGet8Ex (\r
   IN CONST EFI_GUID         *Guid,\r

-  IN PCD_TOKEN_NUMBER      ExTokenNumber\r
+  IN UINTN                 ExTokenNumber\r

   )\r
 {\r
   return *((UINT8 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT8)));\r
   )\r
 {\r
   return *((UINT8 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT8)));\r


@@ -211,7 +211,7 @@ UINT16
 EFIAPI\r
 DxePcdGet16Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGet16Ex (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER     ExTokenNumber\r
+  IN UINTN                ExTokenNumber\r

   )\r
 {\r
   return ReadUnaligned16 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT16)));\r
   )\r
 {\r
   return ReadUnaligned16 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT16)));\r


@@ -223,7 +223,7 @@ UINT32
 EFIAPI\r
 DxePcdGet32Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGet32Ex (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER      ExTokenNumber\r
+  IN UINTN                 ExTokenNumber\r

   )\r
 {\r
   return ReadUnaligned32 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT32)));\r
   )\r
 {\r
   return ReadUnaligned32 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT32)));\r


@@ -235,7 +235,7 @@ UINT64
 EFIAPI\r
 DxePcdGet64Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGet64Ex (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER      ExTokenNumber\r
+  IN UINTN                 ExTokenNumber\r

   )\r
 {\r
   return ReadUnaligned64 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT64)));\r
   )\r
 {\r
   return ReadUnaligned64 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT64)));\r


@@ -247,7 +247,7 @@ VOID *
 EFIAPI\r
 DxePcdGetPtrEx (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGetPtrEx (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER      ExTokenNumber\r
+  IN UINTN                 ExTokenNumber\r

   )\r
 {\r
   return ExGetWorker (Guid, ExTokenNumber, 0);\r
   )\r
 {\r
   return ExGetWorker (Guid, ExTokenNumber, 0);\r


@@ -259,7 +259,7 @@ BOOLEAN
 EFIAPI\r
 DxePcdGetBoolEx (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGetBoolEx (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER      ExTokenNumber\r
+  IN UINTN                 ExTokenNumber\r

   )\r
 {\r
   return *((BOOLEAN *) ExGetWorker (Guid, ExTokenNumber, sizeof(BOOLEAN)));\r
   )\r
 {\r
   return *((BOOLEAN *) ExGetWorker (Guid, ExTokenNumber, sizeof(BOOLEAN)));\r


@@ -271,7 +271,7 @@ UINTN
 EFIAPI\r
 DxePcdGetSizeEx (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGetSizeEx (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER      ExTokenNumber\r
+  IN UINTN                 ExTokenNumber\r

   )\r
 {\r
   return DxePcdGetSize(GetExPcdTokenNumber (Guid, ExTokenNumber));\r
   )\r
 {\r
   return DxePcdGetSize(GetExPcdTokenNumber (Guid, ExTokenNumber));\r


@@ -282,7 +282,7 @@ DxePcdGetSizeEx (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet8 (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet8 (\r

-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r

   IN UINT8              Value\r
   )\r
 {\r
   IN UINT8              Value\r
   )\r
 {\r


@@ -294,7 +294,7 @@ DxePcdSet8 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet16 (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet16 (\r

-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r

   IN UINT16             Value\r
   )\r
 {\r
   IN UINT16             Value\r
   )\r
 {\r


@@ -306,7 +306,7 @@ DxePcdSet16 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet32 (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet32 (\r

-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r

   IN UINT32             Value\r
   )\r
 {\r
   IN UINT32             Value\r
   )\r
 {\r


@@ -318,7 +318,7 @@ DxePcdSet32 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet64 (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet64 (\r

-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r

   IN UINT64             Value\r
   )\r
 {\r
   IN UINT64             Value\r
   )\r
 {\r


@@ -330,7 +330,7 @@ DxePcdSet64 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetPtr (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetPtr (\r

-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r

   IN UINTN              SizeOfBuffer,\r
   IN VOID               *Buffer\r
   )\r
   IN UINTN              SizeOfBuffer,\r
   IN VOID               *Buffer\r
   )\r


@@ -343,7 +343,7 @@ DxePcdSetPtr (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetBool (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetBool (\r

-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r

   IN BOOLEAN            Value\r
   )\r
 {\r
   IN BOOLEAN            Value\r
   )\r
 {\r


@@ -356,7 +356,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSet8Ex (\r
   IN CONST EFI_GUID         *Guid,\r
 EFIAPI\r
 DxePcdSet8Ex (\r
   IN CONST EFI_GUID         *Guid,\r

-  IN PCD_TOKEN_NUMBER       ExTokenNumber,\r
+  IN UINTN                  ExTokenNumber,\r

   IN UINT8                  Value\r
   )\r
 {\r
   IN UINT8                  Value\r
   )\r
 {\r


@@ -375,7 +375,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSet16Ex (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 DxePcdSet16Ex (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  ExTokenNumber,\r
+  IN UINTN             ExTokenNumber,\r

   IN UINT16            Value\r
   )\r
 {\r
   IN UINT16            Value\r
   )\r
 {\r


@@ -394,7 +394,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSet32Ex (\r
   IN CONST EFI_GUID     *Guid,\r
 EFIAPI\r
 DxePcdSet32Ex (\r
   IN CONST EFI_GUID     *Guid,\r

-  IN PCD_TOKEN_NUMBER   ExTokenNumber,\r
+  IN UINTN              ExTokenNumber,\r

   IN UINT32             Value\r
   )\r
 {\r
   IN UINT32             Value\r
   )\r
 {\r


@@ -413,7 +413,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSet64Ex (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 DxePcdSet64Ex (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  ExTokenNumber,\r
+  IN UINTN             ExTokenNumber,\r

   IN UINT64            Value\r
   )\r
 {\r
   IN UINT64            Value\r
   )\r
 {\r


@@ -432,7 +432,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSetPtrEx (\r
   IN CONST EFI_GUID         *Guid,\r
 EFIAPI\r
 DxePcdSetPtrEx (\r
   IN CONST EFI_GUID         *Guid,\r

-  IN PCD_TOKEN_NUMBER       ExTokenNumber,\r
+  IN UINTN                  ExTokenNumber,\r

   IN UINTN                  SizeOfBuffer,\r
   IN VOID                   *Buffer\r
   )\r
   IN UINTN                  SizeOfBuffer,\r
   IN VOID                   *Buffer\r
   )\r


@@ -452,7 +452,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSetBoolEx (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 DxePcdSetBoolEx (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  ExTokenNumber,\r
+  IN UINTN             ExTokenNumber,\r

   IN BOOLEAN           Value\r
   )\r
 {\r
   IN BOOLEAN           Value\r
   )\r
 {\r


@@ -471,7 +471,7 @@ DxePcdSetBoolEx (
 EFI_STATUS\r
 EFIAPI\r
 DxeRegisterCallBackOnSet (\r
 EFI_STATUS\r
 EFIAPI\r
 DxeRegisterCallBackOnSet (\r

-  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  UINTN                   TokenNumber,\r

   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r


@@ -486,7 +486,7 @@ DxeRegisterCallBackOnSet (
 EFI_STATUS\r
 EFIAPI\r
 DxeUnRegisterCallBackOnSet (\r
 EFI_STATUS\r
 EFIAPI\r
 DxeUnRegisterCallBackOnSet (\r

-  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  UINTN                   TokenNumber,\r

   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r


@@ -502,10 +502,10 @@ EFI_STATUS
 EFIAPI\r
 DxePcdGetNextToken (\r
   IN CONST EFI_GUID         *Guid, OPTIONAL\r
 EFIAPI\r
 DxePcdGetNextToken (\r
   IN CONST EFI_GUID         *Guid, OPTIONAL\r

-  IN OUT   PCD_TOKEN_NUMBER *TokenNumber\r
+  IN OUT   UINTN            *TokenNumber\r

   )\r
 {\r
   )\r
 {\r

-  PCD_TOKEN_NUMBER    ExTokenNumber;\r
+  UINTN               ExTokenNumber;\r

   \r
   //\r
   // Scan the local token space\r
   \r
   //\r
   // Scan the local token space\r

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c
index 00437f116c327b316dd75f07412a333cf2d9b858..8cb08dcd7c4e5a9860ddd4a70dcb6472e3712f05 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -28,7 +28,7 @@ LIST_ENTRY *mCallbackFnTable;
 \r
 VOID *\r
 GetWorker (\r
 \r
 VOID *\r
 GetWorker (\r

-  PCD_TOKEN_NUMBER  TokenNumber,\r
+  UINTN             TokenNumber,\r

   UINTN             GetSize\r
   )\r
 {\r
   UINTN             GetSize\r
   )\r
 {\r


@@ -124,7 +124,7 @@ GetWorker (
 \r
 EFI_STATUS\r
 DxeRegisterCallBackWorker (\r
 \r
 EFI_STATUS\r
 DxeRegisterCallBackWorker (\r

-  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  UINTN                   TokenNumber,\r

   IN  CONST GUID              *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
 )\r
   IN  CONST GUID              *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
 )\r


@@ -167,7 +167,7 @@ DxeRegisterCallBackWorker (
 \r
 EFI_STATUS\r
 DxeUnRegisterCallBackWorker (\r
 \r
 EFI_STATUS\r
 DxeUnRegisterCallBackWorker (\r

-  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  UINTN                   TokenNumber,\r

   IN  CONST GUID              *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
 )\r
   IN  CONST GUID              *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
 )\r


@@ -205,10 +205,10 @@ DxeUnRegisterCallBackWorker (
 \r
 \r
 \r
 \r
 \r
 \r

-PCD_TOKEN_NUMBER\r
+UINTN           \r

 ExGetNextTokeNumber (\r
   IN CONST EFI_GUID         *Guid,\r
 ExGetNextTokeNumber (\r
   IN CONST EFI_GUID         *Guid,\r

-  IN PCD_TOKEN_NUMBER       TokenNumber,\r
+  IN UINTN                  TokenNumber,\r

   IN EFI_GUID               *GuidTable,\r
   IN UINTN                  SizeOfGuidTable,\r
   IN DYNAMICEX_MAPPING      *ExMapTable,\r
   IN EFI_GUID               *GuidTable,\r
   IN UINTN                  SizeOfGuidTable,\r
   IN DYNAMICEX_MAPPING      *ExMapTable,\r


@@ -272,7 +272,7 @@ ExGetNextTokeNumber (
 VOID\r
 BuildPcdDxeDataBase (\r
   VOID\r
 VOID\r
 BuildPcdDxeDataBase (\r
   VOID\r

-)\r
+  )\r

 {\r
   PEI_PCD_DATABASE    *PeiDatabase;\r
   EFI_HOB_GUID_TYPE   *GuidHob;\r
 {\r
   PEI_PCD_DATABASE    *PeiDatabase;\r
   EFI_HOB_GUID_TYPE   *GuidHob;\r


@@ -312,7 +312,7 @@ BuildPcdDxeDataBase (
   //\r
 \r
   if (PCD_TOTAL_TOKEN_NUMBER != 0) {\r
   //\r
 \r
   if (PCD_TOTAL_TOKEN_NUMBER != 0) {\r

-    mCallbackFnTable = AllocateZeroPool (PCD_TOTAL_TOKEN_NUMBER);\r
+    mCallbackFnTable = AllocateZeroPool (PCD_TOTAL_TOKEN_NUMBER * sizeof (LIST_ENTRY));\r

   }\r
   \r
   for (Idx = 0; Idx < PCD_TOTAL_TOKEN_NUMBER; Idx++) {\r
   }\r
   \r
   for (Idx = 0; Idx < PCD_TOTAL_TOKEN_NUMBER; Idx++) {\r


@@ -457,7 +457,7 @@ InvokeCallbackOnSet (
 \r
 EFI_STATUS\r
 SetWorker (\r
 \r
 EFI_STATUS\r
 SetWorker (\r

-  PCD_TOKEN_NUMBER        TokenNumber,\r
+  UINTN                   TokenNumber,\r

   VOID                    *Data,\r
   UINTN                   Size,\r
   BOOLEAN                 PtrType\r
   VOID                    *Data,\r
   UINTN                   Size,\r
   BOOLEAN                 PtrType\r


@@ -592,14 +592,14 @@ ExGetWorker (
 \r
 EFI_STATUS\r
 ExSetWorker (\r
 \r
 EFI_STATUS\r
 ExSetWorker (\r

-  IN PCD_TOKEN_NUMBER     ExTokenNumber,\r
+  IN UINTN                ExTokenNumber,\r

   IN CONST EFI_GUID       *Guid,\r
   VOID                    *Data,\r
   UINTN                   SetSize,\r
   BOOLEAN                 PtrType\r
   )\r
 {\r
   IN CONST EFI_GUID       *Guid,\r
   VOID                    *Data,\r
   UINTN                   SetSize,\r
   BOOLEAN                 PtrType\r
   )\r
 {\r

-  PCD_TOKEN_NUMBER        TokenNumber;\r
+  UINTN                   TokenNumber;\r

   \r
   TokenNumber = GetExPcdTokenNumber (Guid, ExTokenNumber);\r
 \r
   \r
   TokenNumber = GetExPcdTokenNumber (Guid, ExTokenNumber);\r
 \r


@@ -669,10 +669,10 @@ SetHiiVariable (
 \r
 \r
 \r
 \r
 \r
 \r

-PCD_TOKEN_NUMBER\r
+UINTN           \r

 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r

-  IN PCD_TOKEN_NUMBER           ExTokenNumber\r
+  IN UINTN                      ExTokenNumber\r

   )\r
 {\r
   UINT32              i;\r
   )\r
 {\r
   UINT32              i;\r

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.h b/EdkModulePkg/Universal/PCD/Dxe/Service.h
index af9fc420a3a09e74d2f8013ff2120d819fbb224e..2784d28891c3252706334921542103851bc434cb 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.h
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.h
@@ -46,7 +46,7 @@ typedef struct {
 \r
 EFI_STATUS\r
 SetWorker (\r
 \r
 EFI_STATUS\r
 SetWorker (\r

-  IN PCD_TOKEN_NUMBER          TokenNumber,\r
+  IN UINTN                     TokenNumber,\r

   IN VOID                      *Data,\r
   IN UINTN                     Size,\r
   IN BOOLEAN                   PtrType\r
   IN VOID                      *Data,\r
   IN UINTN                     Size,\r
   IN BOOLEAN                   PtrType\r


@@ -55,7 +55,7 @@ SetWorker (
 \r
 EFI_STATUS\r
 ExSetWorker (\r
 \r
 EFI_STATUS\r
 ExSetWorker (\r

-  IN PCD_TOKEN_NUMBER     ExTokenNumber,\r
+  IN UINTN                ExTokenNumber,\r

   IN CONST EFI_GUID       *Guid,\r
   VOID                    *Data,\r
   UINTN                   Size,\r
   IN CONST EFI_GUID       *Guid,\r
   VOID                    *Data,\r
   UINTN                   Size,\r


@@ -66,7 +66,7 @@ ExSetWorker (
 \r
 VOID *\r
 GetWorker (\r
 \r
 VOID *\r
 GetWorker (\r

-  PCD_TOKEN_NUMBER  TokenNumber,\r
+  UINTN             TokenNumber,\r

   UINTN             GetSize\r
   )\r
 ;\r
   UINTN             GetSize\r
   )\r
 ;\r


@@ -74,7 +74,7 @@ GetWorker (
 VOID *\r
 ExGetWorker (\r
   IN CONST EFI_GUID         *Guid,\r
 VOID *\r
 ExGetWorker (\r
   IN CONST EFI_GUID         *Guid,\r

-  IN PCD_TOKEN_NUMBER       ExTokenNumber,\r
+  IN UINTN                  ExTokenNumber,\r

   IN UINTN                  GetSize\r
   ) \r
 ;\r
   IN UINTN                  GetSize\r
   ) \r
 ;\r


@@ -98,14 +98,14 @@ GetHiiVariable (
 \r
 EFI_STATUS\r
 DxeRegisterCallBackWorker (\r
 \r
 EFI_STATUS\r
 DxeRegisterCallBackWorker (\r

-  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  UINTN                   TokenNumber,\r

   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
 );\r
 \r
 EFI_STATUS\r
 DxeUnRegisterCallBackWorker (\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
 );\r
 \r
 EFI_STATUS\r
 DxeUnRegisterCallBackWorker (\r

-  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  UINTN                   TokenNumber,\r

   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
 );\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
 );\r


@@ -116,10 +116,10 @@ BuildPcdDxeDataBase (
 );\r
 \r
 \r
 );\r
 \r
 \r

-PCD_TOKEN_NUMBER\r
+UINTN           \r

 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r

-  IN PCD_TOKEN_NUMBER           ExTokenNumber\r
+  IN UINTN                      ExTokenNumber\r

   )\r
 ;\r
 //\r
   )\r
 ;\r
 //\r


@@ -128,7 +128,7 @@ GetExPcdTokenNumber (
 VOID\r
 EFIAPI\r
 DxePcdSetSku (\r
 VOID\r
 EFIAPI\r
 DxePcdSetSku (\r

-  IN  SKU_ID                  SkuId\r
+  IN  UINTN                  SkuId\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -136,7 +136,7 @@ DxePcdSetSku (
 UINT8\r
 EFIAPI\r
 DxePcdGet8 (\r
 UINT8\r
 EFIAPI\r
 DxePcdGet8 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -144,7 +144,7 @@ DxePcdGet8 (
 UINT16\r
 EFIAPI\r
 DxePcdGet16 (\r
 UINT16\r
 EFIAPI\r
 DxePcdGet16 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -152,7 +152,7 @@ DxePcdGet16 (
 UINT32\r
 EFIAPI\r
 DxePcdGet32 (\r
 UINT32\r
 EFIAPI\r
 DxePcdGet32 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -160,7 +160,7 @@ DxePcdGet32 (
 UINT64\r
 EFIAPI\r
 DxePcdGet64 (\r
 UINT64\r
 EFIAPI\r
 DxePcdGet64 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -168,7 +168,7 @@ DxePcdGet64 (
 VOID *\r
 EFIAPI\r
 DxePcdGetPtr (\r
 VOID *\r
 EFIAPI\r
 DxePcdGetPtr (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -176,7 +176,7 @@ DxePcdGetPtr (
 BOOLEAN\r
 EFIAPI\r
 DxePcdGetBool (\r
 BOOLEAN\r
 EFIAPI\r
 DxePcdGetBool (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -184,7 +184,7 @@ DxePcdGetBool (
 UINTN\r
 EFIAPI\r
 DxePcdGetSize (\r
 UINTN\r
 EFIAPI\r
 DxePcdGetSize (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -193,7 +193,7 @@ UINT8
 EFIAPI\r
 DxePcdGet8Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGet8Ex (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -202,7 +202,7 @@ UINT16
 EFIAPI\r
 DxePcdGet16Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGet16Ex (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -211,7 +211,7 @@ UINT32
 EFIAPI\r
 DxePcdGet32Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGet32Ex (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -221,7 +221,7 @@ UINT64
 EFIAPI\r
 DxePcdGet64Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGet64Ex (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -231,7 +231,7 @@ VOID *
 EFIAPI\r
 DxePcdGetPtrEx (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGetPtrEx (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -240,7 +240,7 @@ BOOLEAN
 EFIAPI\r
 DxePcdGetBoolEx (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGetBoolEx (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -249,7 +249,7 @@ UINTN
 EFIAPI\r
 DxePcdGetSizeEx (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGetSizeEx (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -257,7 +257,7 @@ DxePcdGetSizeEx (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet8 (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet8 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT8             Value\r
   )\r
 ;\r
   IN UINT8             Value\r
   )\r
 ;\r


@@ -266,7 +266,7 @@ DxePcdSet8 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet16 (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet16 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT16             Value\r
   )\r
 ;\r
   IN UINT16             Value\r
   )\r
 ;\r


@@ -275,7 +275,7 @@ DxePcdSet16 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet32 (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet32 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT32             Value\r
   )\r
 ;\r
   IN UINT32             Value\r
   )\r
 ;\r


@@ -284,7 +284,7 @@ DxePcdSet32 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet64 (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet64 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT64            Value\r
   )\r
 ;\r
   IN UINT64            Value\r
   )\r
 ;\r


@@ -293,7 +293,7 @@ DxePcdSet64 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetPtr (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetPtr (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   )\r
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   )\r


@@ -303,7 +303,7 @@ DxePcdSetPtr (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetBool (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetBool (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN BOOLEAN           Value\r
   )\r
 ;\r
   IN BOOLEAN           Value\r
   )\r
 ;\r


@@ -313,7 +313,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSet8Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdSet8Ex (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT8             Value\r
   )\r
 ;\r
   IN UINT8             Value\r
   )\r
 ;\r


@@ -323,7 +323,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSet16Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdSet16Ex (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT16            Value\r
   )\r
 ;\r
   IN UINT16            Value\r
   )\r
 ;\r


@@ -333,7 +333,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSet32Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdSet32Ex (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT32             Value\r
   )\r
 ;\r
   IN UINT32             Value\r
   )\r
 ;\r


@@ -343,7 +343,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSet64Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdSet64Ex (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT64            Value\r
   )\r
 ;\r
   IN UINT64            Value\r
   )\r
 ;\r


@@ -353,7 +353,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSetPtrEx (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 DxePcdSetPtrEx (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   )\r
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   )\r


@@ -364,7 +364,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSetBoolEx (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 DxePcdSetBoolEx (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN BOOLEAN           Value\r
   )\r
 ;\r
   IN BOOLEAN           Value\r
   )\r
 ;\r


@@ -374,7 +374,7 @@ DxePcdSetBoolEx (
 EFI_STATUS\r
 EFIAPI\r
 DxeRegisterCallBackOnSet (\r
 EFI_STATUS\r
 EFIAPI\r
 DxeRegisterCallBackOnSet (\r

-  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  UINTN                   TokenNumber,\r

   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r


@@ -384,7 +384,7 @@ DxeRegisterCallBackOnSet (
 EFI_STATUS\r
 EFIAPI\r
 DxeUnRegisterCallBackOnSet (\r
 EFI_STATUS\r
 EFIAPI\r
 DxeUnRegisterCallBackOnSet (\r

-  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  UINTN                   TokenNumber,\r

   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r


@@ -395,14 +395,14 @@ EFI_STATUS
 EFIAPI\r
 DxePcdGetNextToken (\r
   IN CONST EFI_GUID               *Guid, OPTIONAL\r
 EFIAPI\r
 DxePcdGetNextToken (\r
   IN CONST EFI_GUID               *Guid, OPTIONAL\r

-  IN OUT   PCD_TOKEN_NUMBER       *TokenNumber\r
+  IN OUT   UINTN                  *TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

-PCD_TOKEN_NUMBER\r
+UINTN           \r

 ExGetNextTokeNumber (\r
   IN CONST EFI_GUID    *Guid,\r
 ExGetNextTokeNumber (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN EFI_GUID          *GuidTable,\r
   IN UINTN             SizeOfGuidTable,\r
   IN DYNAMICEX_MAPPING *ExMapTable,\r
   IN EFI_GUID          *GuidTable,\r
   IN UINTN             SizeOfGuidTable,\r
   IN DYNAMICEX_MAPPING *ExMapTable,\r

diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.c b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
index 70b229e3a931c19a7fb168f981434f8f39a1f739..52390e404c22969ce9c5e0ae816308fe44543aac 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
@@ -86,11 +86,11 @@ PcdPeimInit (
 VOID\r
 EFIAPI\r
 PeiPcdSetSku (\r
 VOID\r
 EFIAPI\r
 PeiPcdSetSku (\r

-  IN  SKU_ID                  SkuId\r
+  IN  UINTN                  SkuId\r

   )\r
 {\r
 \r
   )\r
 {\r
 \r

-  GetPcdDatabase()->Init.SystemSkuId = SkuId;\r
+  GetPcdDatabase()->Init.SystemSkuId = (SKU_ID) SkuId;\r

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


@@ -100,7 +100,7 @@ PeiPcdSetSku (
 UINT8\r
 EFIAPI\r
 PeiPcdGet8 (\r
 UINT8\r
 EFIAPI\r
 PeiPcdGet8 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return *((UINT8 *) GetWorker (TokenNumber, sizeof (UINT8)));\r
   )\r
 {\r
   return *((UINT8 *) GetWorker (TokenNumber, sizeof (UINT8)));\r


@@ -111,7 +111,7 @@ PeiPcdGet8 (
 UINT16\r
 EFIAPI\r
 PeiPcdGet16 (\r
 UINT16\r
 EFIAPI\r
 PeiPcdGet16 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return ReadUnaligned16 (GetWorker (TokenNumber, sizeof (UINT16)));\r
   )\r
 {\r
   return ReadUnaligned16 (GetWorker (TokenNumber, sizeof (UINT16)));\r


@@ -122,7 +122,7 @@ PeiPcdGet16 (
 UINT32\r
 EFIAPI\r
 PeiPcdGet32 (\r
 UINT32\r
 EFIAPI\r
 PeiPcdGet32 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return ReadUnaligned32 (GetWorker (TokenNumber, sizeof (UINT32)));\r
   )\r
 {\r
   return ReadUnaligned32 (GetWorker (TokenNumber, sizeof (UINT32)));\r


@@ -133,7 +133,7 @@ PeiPcdGet32 (
 UINT64\r
 EFIAPI\r
 PeiPcdGet64 (\r
 UINT64\r
 EFIAPI\r
 PeiPcdGet64 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return ReadUnaligned64 (GetWorker (TokenNumber, sizeof (UINT64)));\r
   )\r
 {\r
   return ReadUnaligned64 (GetWorker (TokenNumber, sizeof (UINT64)));\r


@@ -144,7 +144,7 @@ PeiPcdGet64 (
 VOID *\r
 EFIAPI\r
 PeiPcdGetPtr (\r
 VOID *\r
 EFIAPI\r
 PeiPcdGetPtr (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return GetWorker (TokenNumber, 0);\r
   )\r
 {\r
   return GetWorker (TokenNumber, 0);\r


@@ -155,7 +155,7 @@ PeiPcdGetPtr (
 BOOLEAN\r
 EFIAPI\r
 PeiPcdGetBool (\r
 BOOLEAN\r
 EFIAPI\r
 PeiPcdGetBool (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return *((BOOLEAN *) GetWorker (TokenNumber, sizeof (BOOLEAN)));\r
   )\r
 {\r
   return *((BOOLEAN *) GetWorker (TokenNumber, sizeof (BOOLEAN)));\r


@@ -166,7 +166,7 @@ PeiPcdGetBool (
 UINTN\r
 EFIAPI\r
 PeiPcdGetSize (\r
 UINTN\r
 EFIAPI\r
 PeiPcdGetSize (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r
   )\r
 {\r
   ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r


@@ -180,7 +180,7 @@ UINT8
 EFIAPI\r
 PeiPcdGet8Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 PeiPcdGet8Ex (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  ExTokenNumber\r
+  IN UINTN             ExTokenNumber\r

   )\r
 {\r
   return *((UINT8 *) ExGetWorker (Guid, ExTokenNumber, sizeof (UINT8)));\r
   )\r
 {\r
   return *((UINT8 *) ExGetWorker (Guid, ExTokenNumber, sizeof (UINT8)));\r


@@ -192,7 +192,7 @@ UINT16
 EFIAPI\r
 PeiPcdGet16Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 PeiPcdGet16Ex (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  ExTokenNumber\r
+  IN UINTN             ExTokenNumber\r

   )\r
 {\r
   return ReadUnaligned16 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT16)));\r
   )\r
 {\r
   return ReadUnaligned16 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT16)));\r


@@ -204,7 +204,7 @@ UINT32
 EFIAPI\r
 PeiPcdGet32Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 PeiPcdGet32Ex (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  ExTokenNumber\r
+  IN UINTN             ExTokenNumber\r

   )\r
 {\r
   return ReadUnaligned32 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT32)));\r
   )\r
 {\r
   return ReadUnaligned32 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT32)));\r


@@ -216,7 +216,7 @@ UINT64
 EFIAPI\r
 PeiPcdGet64Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 PeiPcdGet64Ex (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  ExTokenNumber\r
+  IN UINTN             ExTokenNumber\r

   )\r
 {\r
   return ReadUnaligned64 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT64)));\r
   )\r
 {\r
   return ReadUnaligned64 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT64)));\r


@@ -228,7 +228,7 @@ VOID *
 EFIAPI\r
 PeiPcdGetPtrEx (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 PeiPcdGetPtrEx (\r
   IN CONST EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  ExTokenNumber\r
+  IN UINTN             ExTokenNumber\r

   )\r
 {\r
   return ExGetWorker (Guid, ExTokenNumber, 0);\r
   )\r
 {\r
   return ExGetWorker (Guid, ExTokenNumber, 0);\r


@@ -240,7 +240,7 @@ BOOLEAN
 EFIAPI\r
 PeiPcdGetBoolEx (\r
   IN CONST  EFI_GUID        *Guid,\r
 EFIAPI\r
 PeiPcdGetBoolEx (\r
   IN CONST  EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER                  ExTokenNumber\r
+  IN UINTN                             ExTokenNumber\r

   )\r
 {\r
   return *((BOOLEAN *) ExGetWorker (Guid, ExTokenNumber, sizeof (BOOLEAN)));\r
   )\r
 {\r
   return *((BOOLEAN *) ExGetWorker (Guid, ExTokenNumber, sizeof (BOOLEAN)));\r


@@ -252,7 +252,7 @@ UINTN
 EFIAPI\r
 PeiPcdGetSizeEx (\r
   IN CONST  EFI_GUID        *Guid,\r
 EFIAPI\r
 PeiPcdGetSizeEx (\r
   IN CONST  EFI_GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER                  ExTokenNumber\r
+  IN UINTN                             ExTokenNumber\r

   )\r
 {\r
   return PeiPcdGetSize (GetExPcdTokenNumber (Guid, ExTokenNumber));\r
   )\r
 {\r
   return PeiPcdGetSize (GetExPcdTokenNumber (Guid, ExTokenNumber));\r


@@ -263,7 +263,7 @@ PeiPcdGetSizeEx (
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSet8 (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSet8 (\r

-  IN PCD_TOKEN_NUMBER             TokenNumber,\r
+  IN UINTN                        TokenNumber,\r

   IN UINT8             Value\r
   )\r
 {\r
   IN UINT8             Value\r
   )\r
 {\r


@@ -275,7 +275,7 @@ PeiPcdSet8 (
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSet16 (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSet16 (\r

-  IN PCD_TOKEN_NUMBER              TokenNumber,\r
+  IN UINTN                         TokenNumber,\r

   IN UINT16             Value\r
   )\r
 {\r
   IN UINT16             Value\r
   )\r
 {\r


@@ -287,7 +287,7 @@ PeiPcdSet16 (
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSet32 (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSet32 (\r

-  IN PCD_TOKEN_NUMBER              TokenNumber,\r
+  IN UINTN                         TokenNumber,\r

   IN UINT32             Value\r
   )\r
 {\r
   IN UINT32             Value\r
   )\r
 {\r


@@ -299,7 +299,7 @@ PeiPcdSet32 (
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSet64 (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSet64 (\r

-  IN PCD_TOKEN_NUMBER              TokenNumber,\r
+  IN UINTN                         TokenNumber,\r

   IN UINT64             Value\r
   )\r
 {\r
   IN UINT64             Value\r
   )\r
 {\r


@@ -310,7 +310,7 @@ PeiPcdSet64 (
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSetPtr (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSetPtr (\r

-  IN PCD_TOKEN_NUMBER              TokenNumber,\r
+  IN UINTN                         TokenNumber,\r

   IN UINTN                         SizeOfBuffer,\r
   IN VOID                          *Buffer\r
   )\r
   IN UINTN                         SizeOfBuffer,\r
   IN VOID                          *Buffer\r
   )\r


@@ -323,7 +323,7 @@ PeiPcdSetPtr (
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSetBool (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSetBool (\r

-  IN PCD_TOKEN_NUMBER              TokenNumber,\r
+  IN UINTN                         TokenNumber,\r

   IN BOOLEAN            Value\r
   )\r
 {\r
   IN BOOLEAN            Value\r
   )\r
 {\r


@@ -336,7 +336,7 @@ EFI_STATUS
 EFIAPI\r
 PeiPcdSet8Ex (\r
   IN CONST EFI_GUID         *Guid,\r
 EFIAPI\r
 PeiPcdSet8Ex (\r
   IN CONST EFI_GUID         *Guid,\r

-  IN PCD_TOKEN_NUMBER       ExTokenNumber,\r
+  IN UINTN                  ExTokenNumber,\r

   IN UINT8                  Value\r
   )\r
 {\r
   IN UINT8                  Value\r
   )\r
 {\r


@@ -355,7 +355,7 @@ EFI_STATUS
 EFIAPI\r
 PeiPcdSet16Ex (\r
   IN CONST EFI_GUID         *Guid,\r
 EFIAPI\r
 PeiPcdSet16Ex (\r
   IN CONST EFI_GUID         *Guid,\r

-  IN PCD_TOKEN_NUMBER       ExTokenNumber,\r
+  IN UINTN                  ExTokenNumber,\r

   IN UINT16                 Value\r
   )\r
 {\r
   IN UINT16                 Value\r
   )\r
 {\r


@@ -374,7 +374,7 @@ EFI_STATUS
 EFIAPI\r
 PeiPcdSet32Ex (\r
   IN CONST EFI_GUID         *Guid,\r
 EFIAPI\r
 PeiPcdSet32Ex (\r
   IN CONST EFI_GUID         *Guid,\r

-  IN PCD_TOKEN_NUMBER       ExTokenNumber,\r
+  IN UINTN                  ExTokenNumber,\r

   IN UINT32                 Value\r
   )\r
 {\r
   IN UINT32                 Value\r
   )\r
 {\r


@@ -393,7 +393,7 @@ EFI_STATUS
 EFIAPI\r
 PeiPcdSet64Ex (\r
   IN CONST EFI_GUID         *Guid,\r
 EFIAPI\r
 PeiPcdSet64Ex (\r
   IN CONST EFI_GUID         *Guid,\r

-  IN PCD_TOKEN_NUMBER       ExTokenNumber,\r
+  IN UINTN                  ExTokenNumber,\r

   IN UINT64                 Value\r
   )\r
 {\r
   IN UINT64                 Value\r
   )\r
 {\r


@@ -412,7 +412,7 @@ EFI_STATUS
 EFIAPI\r
 PeiPcdSetPtrEx (\r
   IN CONST EFI_GUID         *Guid,\r
 EFIAPI\r
 PeiPcdSetPtrEx (\r
   IN CONST EFI_GUID         *Guid,\r

-  IN PCD_TOKEN_NUMBER       ExTokenNumber,\r
+  IN UINTN                  ExTokenNumber,\r

   IN UINTN                  SizeOfBuffer,\r
   IN VOID                   *Value\r
   )\r
   IN UINTN                  SizeOfBuffer,\r
   IN VOID                   *Value\r
   )\r


@@ -432,7 +432,7 @@ EFI_STATUS
 EFIAPI\r
 PeiPcdSetBoolEx (\r
   IN CONST EFI_GUID       *Guid,\r
 EFIAPI\r
 PeiPcdSetBoolEx (\r
   IN CONST EFI_GUID       *Guid,\r

-  IN PCD_TOKEN_NUMBER     ExTokenNumber,\r
+  IN UINTN                ExTokenNumber,\r

   IN BOOLEAN              Value\r
   )\r
 {\r
   IN BOOLEAN              Value\r
   )\r
 {\r


@@ -451,7 +451,7 @@ PeiPcdSetBoolEx (
 EFI_STATUS\r
 EFIAPI\r
 PeiRegisterCallBackOnSet (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiRegisterCallBackOnSet (\r

-  IN  PCD_TOKEN_NUMBER            ExTokenNumber,\r
+  IN  UINTN                       ExTokenNumber,\r

   IN  CONST EFI_GUID              *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK            CallBackFunction\r
   )\r
   IN  CONST EFI_GUID              *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK            CallBackFunction\r
   )\r


@@ -466,7 +466,7 @@ PeiRegisterCallBackOnSet (
 EFI_STATUS\r
 EFIAPI\r
 PcdUnRegisterCallBackOnSet (\r
 EFI_STATUS\r
 EFIAPI\r
 PcdUnRegisterCallBackOnSet (\r

-  IN  PCD_TOKEN_NUMBER            ExTokenNumber,\r
+  IN  UINTN                       ExTokenNumber,\r

   IN  CONST EFI_GUID              *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK            CallBackFunction\r
   )\r
   IN  CONST EFI_GUID              *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK            CallBackFunction\r
   )\r


@@ -482,7 +482,7 @@ EFI_STATUS
 EFIAPI\r
 PeiPcdGetNextToken (\r
   IN CONST EFI_GUID               *Guid, OPTIONAL\r
 EFIAPI\r
 PeiPcdGetNextToken (\r
   IN CONST EFI_GUID               *Guid, OPTIONAL\r

-  IN OUT  PCD_TOKEN_NUMBER        *TokenNumber\r
+  IN OUT  UINTN                   *TokenNumber\r

   )\r
 {\r
   UINTN               GuidTableIdx;\r
   )\r
 {\r
   UINTN               GuidTableIdx;\r

diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.c b/EdkModulePkg/Universal/PCD/Pei/Service.c
index 62e2f9c1140b5ae039fe3ceb8a014aff177edd62..247ebadcd7559724e5af3e65e19e8613f67b1b89 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Service.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.c
@@ -30,7 +30,7 @@ Module Name: Service.c
 --*/\r
 EFI_STATUS\r
 PeiRegisterCallBackWorker (\r
 --*/\r
 EFI_STATUS\r
 PeiRegisterCallBackWorker (\r

-  IN  PCD_TOKEN_NUMBER            ExTokenNumber,\r
+  IN  UINTN                       ExTokenNumber,\r

   IN  CONST EFI_GUID              *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK            CallBackFunction,\r
   IN  BOOLEAN                     Register\r
   IN  CONST EFI_GUID              *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK            CallBackFunction,\r
   IN  BOOLEAN                     Register\r


@@ -41,7 +41,7 @@ PeiRegisterCallBackWorker (
   PCD_PPI_CALLBACK        Compare;\r
   PCD_PPI_CALLBACK        Assign;\r
   UINT32                  LocalTokenNumber;\r
   PCD_PPI_CALLBACK        Compare;\r
   PCD_PPI_CALLBACK        Assign;\r
   UINT32                  LocalTokenNumber;\r

-  PCD_TOKEN_NUMBER        TokenNumber;\r
+  UINTN                   TokenNumber;\r

   UINTN                   Idx;\r
 \r
   if (Guid == NULL) {\r
   UINTN                   Idx;\r
 \r
   if (Guid == NULL) {\r


@@ -271,7 +271,7 @@ InvokeCallbackOnSet (
 \r
 EFI_STATUS\r
 SetWorker (\r
 \r
 EFI_STATUS\r
 SetWorker (\r

-  PCD_TOKEN_NUMBER    TokenNumber,\r
+  UINTN               TokenNumber,\r

   VOID                *Data,\r
   UINTN               Size,\r
   BOOLEAN             PtrType\r
   VOID                *Data,\r
   UINTN               Size,\r
   BOOLEAN             PtrType\r


@@ -367,14 +367,14 @@ SetWorker (
 \r
 EFI_STATUS\r
 ExSetWorker (\r
 \r
 EFI_STATUS\r
 ExSetWorker (\r

-  IN PCD_TOKEN_NUMBER     ExTokenNumber,\r
+  IN UINTN                ExTokenNumber,\r

   IN CONST EFI_GUID       *Guid,\r
   VOID                    *Data,\r
   UINTN                   Size,\r
   BOOLEAN                 PtrType\r
   )\r
 {\r
   IN CONST EFI_GUID       *Guid,\r
   VOID                    *Data,\r
   UINTN                   Size,\r
   BOOLEAN                 PtrType\r
   )\r
 {\r

-  PCD_TOKEN_NUMBER          TokenNumber;\r
+  UINTN                     TokenNumber;\r

 \r
   TokenNumber = GetExPcdTokenNumber (Guid, ExTokenNumber);\r
 \r
 \r
   TokenNumber = GetExPcdTokenNumber (Guid, ExTokenNumber);\r
 \r


@@ -392,7 +392,7 @@ ExSetWorker (
 VOID *\r
 ExGetWorker (\r
   IN CONST  EFI_GUID  *Guid,\r
 VOID *\r
 ExGetWorker (\r
   IN CONST  EFI_GUID  *Guid,\r

-  IN PCD_TOKEN_NUMBER ExTokenNumber,\r
+  IN UINTN            ExTokenNumber,\r

   IN UINTN            GetSize\r
   )\r
 {\r
   IN UINTN            GetSize\r
   )\r
 {\r


@@ -404,7 +404,7 @@ ExGetWorker (
 \r
 VOID *\r
 GetWorker (\r
 \r
 VOID *\r
 GetWorker (\r

-  PCD_TOKEN_NUMBER    TokenNumber,\r
+  UINTN               TokenNumber,\r

   UINTN               GetSize\r
   )\r
 {\r
   UINTN               GetSize\r
   )\r
 {\r


@@ -481,7 +481,7 @@ GetWorker (
 }\r
 \r
 \r
 }\r
 \r
 \r

-PCD_TOKEN_NUMBER\r
+UINTN           \r

 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
   IN UINT32                     ExTokenNumber\r
 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
   IN UINT32                     ExTokenNumber\r

diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.h b/EdkModulePkg/Universal/PCD/Pei/Service.h
index df774c9d39d8973980d70cf89949ae69a9813df9..e62d0307a71273a686bbb87b1fe88f8bb6ae3654 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Service.h
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.h
@@ -42,7 +42,7 @@ GetPcdDatabase (
 \r
 EFI_STATUS\r
 SetWorker (\r
 \r
 EFI_STATUS\r
 SetWorker (\r

-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r

   IN VOID               *Data,\r
   IN UINTN              Size,\r
   IN BOOLEAN            PtrType\r
   IN VOID               *Data,\r
   IN UINTN              Size,\r
   IN BOOLEAN            PtrType\r


@@ -51,7 +51,7 @@ SetWorker (
 \r
 EFI_STATUS\r
 ExSetWorker (\r
 \r
 EFI_STATUS\r
 ExSetWorker (\r

-  IN PCD_TOKEN_NUMBER     ExTokenNumber,\r
+  IN UINTN                ExTokenNumber,\r

   IN CONST EFI_GUID       *Guid,\r
   IN VOID                 *Data,\r
   IN UINTN                Size,\r
   IN CONST EFI_GUID       *Guid,\r
   IN VOID                 *Data,\r
   IN UINTN                Size,\r


@@ -61,7 +61,7 @@ ExSetWorker (
 \r
 VOID *\r
 GetWorker (\r
 \r
 VOID *\r
 GetWorker (\r

-  IN PCD_TOKEN_NUMBER     TokenNumber,\r
+  IN UINTN                TokenNumber,\r

   IN UINTN                GetSize\r
   )\r
 ;\r
   IN UINTN                GetSize\r
   )\r
 ;\r


@@ -69,7 +69,7 @@ GetWorker (
 VOID *\r
 ExGetWorker (\r
   IN CONST EFI_GUID   *Guid,\r
 VOID *\r
 ExGetWorker (\r
   IN CONST EFI_GUID   *Guid,\r

-  IN PCD_TOKEN_NUMBER ExTokenNumber,\r
+  IN UINTN            ExTokenNumber,\r

   IN UINTN            GetSize\r
   )\r
 ;\r
   IN UINTN            GetSize\r
   )\r
 ;\r


@@ -81,10 +81,10 @@ typedef struct {
 } EX_PCD_ENTRY_ATTRIBUTE;\r
 \r
 \r
 } EX_PCD_ENTRY_ATTRIBUTE;\r
 \r
 \r

-PCD_TOKEN_NUMBER\r
+UINTN           \r

 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r

-  IN PCD_TOKEN_NUMBER           ExTokenNumber\r
+  IN UINTN                      ExTokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -93,7 +93,7 @@ GetExPcdTokenNumber (
 \r
 EFI_STATUS\r
 PeiRegisterCallBackWorker (\r
 \r
 EFI_STATUS\r
 PeiRegisterCallBackWorker (\r

-  IN  PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN  UINTN              TokenNumber,\r

   IN  CONST GUID         *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK   CallBackFunction,\r
   IN  BOOLEAN            Register\r
   IN  CONST GUID         *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK   CallBackFunction,\r
   IN  BOOLEAN            Register\r


@@ -115,7 +115,7 @@ BuildPcdDatabase (
 VOID\r
 EFIAPI\r
 PeiPcdSetSku (\r
 VOID\r
 EFIAPI\r
 PeiPcdSetSku (\r

-  IN  SKU_ID                  SkuId\r
+  IN  UINTN                  SkuId\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -123,7 +123,7 @@ PeiPcdSetSku (
 UINT8\r
 EFIAPI\r
 PeiPcdGet8 (\r
 UINT8\r
 EFIAPI\r
 PeiPcdGet8 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -131,7 +131,7 @@ PeiPcdGet8 (
 UINT16\r
 EFIAPI\r
 PeiPcdGet16 (\r
 UINT16\r
 EFIAPI\r
 PeiPcdGet16 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -139,7 +139,7 @@ PeiPcdGet16 (
 UINT32\r
 EFIAPI\r
 PeiPcdGet32 (\r
 UINT32\r
 EFIAPI\r
 PeiPcdGet32 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -147,7 +147,7 @@ PeiPcdGet32 (
 UINT64\r
 EFIAPI\r
 PeiPcdGet64 (\r
 UINT64\r
 EFIAPI\r
 PeiPcdGet64 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -155,7 +155,7 @@ PeiPcdGet64 (
 VOID *\r
 EFIAPI\r
 PeiPcdGetPtr (\r
 VOID *\r
 EFIAPI\r
 PeiPcdGetPtr (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -163,7 +163,7 @@ PeiPcdGetPtr (
 BOOLEAN\r
 EFIAPI\r
 PeiPcdGetBool (\r
 BOOLEAN\r
 EFIAPI\r
 PeiPcdGetBool (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -171,7 +171,7 @@ PeiPcdGetBool (
 UINTN\r
 EFIAPI\r
 PeiPcdGetSize (\r
 UINTN\r
 EFIAPI\r
 PeiPcdGetSize (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -180,7 +180,7 @@ UINT8
 EFIAPI\r
 PeiPcdGet8Ex (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 PeiPcdGet8Ex (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -189,7 +189,7 @@ UINT16
 EFIAPI\r
 PeiPcdGet16Ex (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 PeiPcdGet16Ex (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -197,7 +197,7 @@ UINT32
 EFIAPI\r
 PeiPcdGet32Ex (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 PeiPcdGet32Ex (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -206,7 +206,7 @@ UINT64
 EFIAPI\r
 PeiPcdGet64Ex (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 PeiPcdGet64Ex (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -215,7 +215,7 @@ VOID *
 EFIAPI\r
 PeiPcdGetPtrEx (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 PeiPcdGetPtrEx (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -224,7 +224,7 @@ BOOLEAN
 EFIAPI\r
 PeiPcdGetBoolEx (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 PeiPcdGetBoolEx (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -233,7 +233,7 @@ UINTN
 EFIAPI\r
 PeiPcdGetSizeEx (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 PeiPcdGetSizeEx (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -241,7 +241,7 @@ PeiPcdGetSizeEx (
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSet8 (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSet8 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT8             Value\r
   )\r
 ;\r
   IN UINT8             Value\r
   )\r
 ;\r


@@ -250,7 +250,7 @@ PeiPcdSet8 (
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSet16 (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSet16 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT16            Value\r
   )\r
 ;\r
   IN UINT16            Value\r
   )\r
 ;\r


@@ -259,7 +259,7 @@ PeiPcdSet16 (
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSet32 (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSet32 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT32            Value\r
   )\r
 ;\r
   IN UINT32            Value\r
   )\r
 ;\r


@@ -268,7 +268,7 @@ PeiPcdSet32 (
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSet64 (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSet64 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT64            Value\r
   )\r
 ;\r
   IN UINT64            Value\r
   )\r
 ;\r


@@ -276,7 +276,7 @@ PeiPcdSet64 (
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSetPtr (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSetPtr (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   )\r
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   )\r


@@ -286,7 +286,7 @@ PeiPcdSetPtr (
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSetBool (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiPcdSetBool (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN BOOLEAN           Value\r
   )\r
 ;\r
   IN BOOLEAN           Value\r
   )\r
 ;\r


@@ -296,7 +296,7 @@ EFI_STATUS
 EFIAPI\r
 PeiPcdSet8Ex (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 PeiPcdSet8Ex (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT8             Value\r
   )\r
 ;\r
   IN UINT8             Value\r
   )\r
 ;\r


@@ -305,7 +305,7 @@ EFI_STATUS
 EFIAPI\r
 PeiPcdSet16Ex (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 PeiPcdSet16Ex (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT16            Value\r
   )\r
 ;\r
   IN UINT16            Value\r
   )\r
 ;\r


@@ -315,7 +315,7 @@ EFI_STATUS
 EFIAPI\r
 PeiPcdSet32Ex (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 PeiPcdSet32Ex (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT32            Value\r
   )\r
 ;\r
   IN UINT32            Value\r
   )\r
 ;\r


@@ -325,7 +325,7 @@ EFI_STATUS
 EFIAPI\r
 PeiPcdSet64Ex (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 PeiPcdSet64Ex (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT64            Value\r
   )\r
 ;\r
   IN UINT64            Value\r
   )\r
 ;\r


@@ -335,7 +335,7 @@ EFI_STATUS
 EFIAPI\r
 PeiPcdSetPtrEx (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 PeiPcdSetPtrEx (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   )\r
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   )\r


@@ -346,7 +346,7 @@ EFI_STATUS
 EFIAPI\r
 PeiPcdSetBoolEx (\r
   IN CONST EFI_GUID    *Guid,\r
 EFIAPI\r
 PeiPcdSetBoolEx (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN BOOLEAN           Value\r
   )\r
 ;\r
   IN BOOLEAN           Value\r
   )\r
 ;\r


@@ -356,7 +356,7 @@ PeiPcdSetBoolEx (
 EFI_STATUS\r
 EFIAPI\r
 PeiRegisterCallBackOnSet (\r
 EFI_STATUS\r
 EFIAPI\r
 PeiRegisterCallBackOnSet (\r

-  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  UINTN                   TokenNumber,\r

   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK        CallBackFunction\r
   )\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK        CallBackFunction\r
   )\r


@@ -366,7 +366,7 @@ PeiRegisterCallBackOnSet (
 EFI_STATUS\r
 EFIAPI\r
 PcdUnRegisterCallBackOnSet (\r
 EFI_STATUS\r
 EFIAPI\r
 PcdUnRegisterCallBackOnSet (\r

-  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  UINTN                   TokenNumber,\r

   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK        CallBackFunction\r
   )\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK        CallBackFunction\r
   )\r


@@ -377,7 +377,7 @@ EFI_STATUS
 EFIAPI\r
 PeiPcdGetNextToken (\r
   IN CONST EFI_GUID           *Guid, OPTIONAL\r
 EFIAPI\r
 PeiPcdGetNextToken (\r
   IN CONST EFI_GUID           *Guid, OPTIONAL\r

-  IN OUT  PCD_TOKEN_NUMBER    *TokenNumber\r
+  IN OUT  UINTN               *TokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

diff --git a/MdePkg/Include/Library/PcdLib.h b/MdePkg/Include/Library/PcdLib.h
index 6d543129cda8c38764a0ea68e4c12df7151a225d..03493e210a18b5042f35dda7c104ec8fc57fa1f7 100644 (file)
--- a/MdePkg/Include/Library/PcdLib.h
+++ b/MdePkg/Include/Library/PcdLib.h
@@ -18,8 +18,7 @@ Module Name: PcdLib.h
 #ifndef __PCD_LIB_H__\r
 #define __PCD_LIB_H__\r
 \r
 #ifndef __PCD_LIB_H__\r
 #define __PCD_LIB_H__\r
 \r

-#include <Common/Pcd.h>\r
-\r
+#define PCD_INVALID_TOKEN_NUMBER ((UINTN) -1)\r

 \r
 #define PcdToken(TokenName)  _PCD_TOKEN_##TokenName\r
 \r
 \r
 #define PcdToken(TokenName)  _PCD_TOKEN_##TokenName\r
 \r


@@ -93,7 +92,7 @@ Module Name: PcdLib.h
 #define PcdSet16(TokenName, Value)      LibPcdSet16  (_PCD_TOKEN_##TokenName, Value)\r
 #define PcdSet32(TokenName, Value)      LibPcdSet32  (_PCD_TOKEN_##TokenName, Value)\r
 #define PcdSet64(TokenName, Value)      LibPcdSet64  (_PCD_TOKEN_##TokenName, Value)\r
 #define PcdSet16(TokenName, Value)      LibPcdSet16  (_PCD_TOKEN_##TokenName, Value)\r
 #define PcdSet32(TokenName, Value)      LibPcdSet32  (_PCD_TOKEN_##TokenName, Value)\r
 #define PcdSet64(TokenName, Value)      LibPcdSet64  (_PCD_TOKEN_##TokenName, Value)\r

-#define PcdSetPtr(TokenName, Value)     LibPcdSetPtr (_PCD_TOKEN_##TokenName, Value)\r
+#define PcdSetPtr(TokenName, SizeOfBuffer, Buffer)     LibPcdSetPtr (_PCD_TOKEN_##TokenName, SizeOfBuffer, Buffer)\r

 #define PcdSetBool(TokenName, Value)    LibPcdSetBool(_PCD_TOKEN_##TokenName, Value)\r
 \r
 \r
 #define PcdSetBool(TokenName, Value)    LibPcdSetBool(_PCD_TOKEN_##TokenName, Value)\r
 \r
 \r


@@ -104,7 +103,7 @@ Module Name: PcdLib.h
 #define PcdSetEx16(Guid, TokenName, Value)     LibPcdSetEx16  (Guid, _PCD_TOKEN_##TokenName, Value)\r
 #define PcdSetEx32(Guid, TokenName, Value)     LibPcdSetEx32  (Guid, _PCD_TOKEN_##TokenName, Value)\r
 #define PcdSetEx64(Guid, TokenName, Value)     LibPcdSetEx64  (Guid, _PCD_TOKEN_##TokenName, Value)\r
 #define PcdSetEx16(Guid, TokenName, Value)     LibPcdSetEx16  (Guid, _PCD_TOKEN_##TokenName, Value)\r
 #define PcdSetEx32(Guid, TokenName, Value)     LibPcdSetEx32  (Guid, _PCD_TOKEN_##TokenName, Value)\r
 #define PcdSetEx64(Guid, TokenName, Value)     LibPcdSetEx64  (Guid, _PCD_TOKEN_##TokenName, Value)\r

-#define PcdSetExPtr(Guid, TokenName, Value)    LibPcdSetExPtr (Guid, _PCD_TOKEN_##TokenName, Value)\r
+#define PcdSetExPtr(Guid, TokenName, SizeOfBuffer, Buffer)    LibPcdSetExPtr (Guid, _PCD_TOKEN_##TokenName, SizeOfBuffer, Buffer)\r

 #define PcdSetExBool(Guid, TokenName, Value)   LibPcdSetExBool(Guid, _PCD_TOKEN_##TokenName, Value)\r
 \r
 \r
 #define PcdSetExBool(Guid, TokenName, Value)   LibPcdSetExBool(Guid, _PCD_TOKEN_##TokenName, Value)\r
 \r
 \r


@@ -117,10 +116,10 @@ Module Name: PcdLib.h
   @retval SKU_ID Return the SKU ID that just be set.\r
 \r
 **/\r
   @retval SKU_ID Return the SKU ID that just be set.\r
 \r
 **/\r

-SKU_ID\r
+UINTN\r

 EFIAPI\r
 LibPcdSetSku (\r
 EFIAPI\r
 LibPcdSetSku (\r

-  IN SKU_ID   SkuId\r
+  IN UINTN   SkuId\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -135,7 +134,7 @@ LibPcdSetSku (
 UINT8\r
 EFIAPI\r
 LibPcdGet8 (\r
 UINT8\r
 EFIAPI\r
 LibPcdGet8 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -150,7 +149,7 @@ LibPcdGet8 (
 UINT16\r
 EFIAPI\r
 LibPcdGet16 (\r
 UINT16\r
 EFIAPI\r
 LibPcdGet16 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -165,7 +164,7 @@ LibPcdGet16 (
 UINT32\r
 EFIAPI\r
 LibPcdGet32 (\r
 UINT32\r
 EFIAPI\r
 LibPcdGet32 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -180,7 +179,7 @@ LibPcdGet32 (
 UINT64\r
 EFIAPI\r
 LibPcdGet64 (\r
 UINT64\r
 EFIAPI\r
 LibPcdGet64 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -195,7 +194,7 @@ LibPcdGet64 (
 VOID *\r
 EFIAPI\r
 LibPcdGetPtr (\r
 VOID *\r
 EFIAPI\r
 LibPcdGetPtr (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -210,7 +209,7 @@ LibPcdGetPtr (
 BOOLEAN \r
 EFIAPI\r
 LibPcdGetBool (\r
 BOOLEAN \r
 EFIAPI\r
 LibPcdGetBool (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -225,7 +224,7 @@ LibPcdGetBool (
 UINTN\r
 EFIAPI\r
 LibPcdGetSize (\r
 UINTN\r
 EFIAPI\r
 LibPcdGetSize (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -244,7 +243,7 @@ UINT8
 EFIAPI\r
 LibPcdGetEx8 (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetEx8 (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -263,7 +262,7 @@ UINT16
 EFIAPI\r
 LibPcdGetEx16 (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetEx16 (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -282,7 +281,7 @@ UINT32
 EFIAPI\r
 LibPcdGetEx32 (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetEx32 (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -301,7 +300,7 @@ UINT64
 EFIAPI\r
 LibPcdGetEx64 (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetEx64 (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -320,7 +319,7 @@ VOID *
 EFIAPI\r
 LibPcdGetExPtr (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetExPtr (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -339,7 +338,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdGetExBool (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetExBool (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -358,7 +357,7 @@ UINTN
 EFIAPI\r
 LibPcdGetExSize (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetExSize (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 \r
   );\r
 \r
 \r


@@ -375,7 +374,7 @@ LibPcdGetExSize (
 UINT8\r
 EFIAPI\r
 LibPcdSet8 (\r
 UINT8\r
 EFIAPI\r
 LibPcdSet8 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT8             Value\r
   );\r
 \r
   IN UINT8             Value\r
   );\r
 \r


@@ -393,7 +392,7 @@ LibPcdSet8 (
 UINT16\r
 EFIAPI\r
 LibPcdSet16 (\r
 UINT16\r
 EFIAPI\r
 LibPcdSet16 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT16            Value\r
   );\r
 \r
   IN UINT16            Value\r
   );\r
 \r


@@ -411,7 +410,7 @@ LibPcdSet16 (
 UINT32\r
 EFIAPI\r
 LibPcdSet32 (\r
 UINT32\r
 EFIAPI\r
 LibPcdSet32 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT32            Value\r
   );\r
 \r
   IN UINT32            Value\r
   );\r
 \r


@@ -429,7 +428,7 @@ LibPcdSet32 (
 UINT64\r
 EFIAPI\r
 LibPcdSet64 (\r
 UINT64\r
 EFIAPI\r
 LibPcdSet64 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT64            Value\r
   );\r
 \r
   IN UINT64            Value\r
   );\r
 \r


@@ -448,7 +447,7 @@ LibPcdSet64 (
 VOID*\r
 EFIAPI\r
 LibPcdSetPtr (\r
 VOID*\r
 EFIAPI\r
 LibPcdSetPtr (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Value\r
   );\r
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Value\r
   );\r


@@ -467,7 +466,7 @@ LibPcdSetPtr (
 BOOLEAN\r
 EFIAPI\r
 LibPcdSetBool (\r
 BOOLEAN\r
 EFIAPI\r
 LibPcdSetBool (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN BOOLEAN           Value\r
   );\r
 \r
   IN BOOLEAN           Value\r
   );\r
 \r


@@ -489,7 +488,7 @@ UINT8
 EFIAPI\r
 LibPcdSetEx8 (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINT8             Value\r
   );\r
 \r


@@ -511,7 +510,7 @@ UINT16
 EFIAPI\r
 LibPcdSetEx16 (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINT16            Value\r
   );\r
 \r


@@ -533,7 +532,7 @@ UINT32
 EFIAPI\r
 LibPcdSetEx32 (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINT32            Value\r
   );\r
 \r


@@ -555,7 +554,7 @@ UINT64
 EFIAPI\r
 LibPcdSetEx64 (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINT64            Value\r
   );\r
 \r


@@ -578,7 +577,7 @@ VOID *
 EFIAPI\r
 LibPcdSetExPtr (\r
   IN CONST GUID        *Guid,\r
 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              *Value\r
   );\r
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Value\r
   );\r


@@ -601,7 +600,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdSetExBool (\r
   IN CONST GUID        *Guid,\r
 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
   IN BOOLEAN           Value\r
   );\r
 \r


@@ -624,7 +623,7 @@ typedef
 VOID\r
 (EFIAPI *PCD_CALLBACK) (\r
   IN        CONST GUID        *CallBackGuid, OPTIONAL\r
 VOID\r
 (EFIAPI *PCD_CALLBACK) (\r
   IN        CONST GUID        *CallBackGuid, OPTIONAL\r

-  IN        PCD_TOKEN_NUMBER  CallBackToken,\r
+  IN        UINTN             CallBackToken,\r

   IN  OUT   VOID              *TokenData,\r
   IN        UINTN             TokenDataSize\r
   );\r
   IN  OUT   VOID              *TokenData,\r
   IN        UINTN             TokenDataSize\r
   );\r


@@ -650,7 +649,7 @@ VOID
 EFIAPI\r
 LibPcdCallbackOnSet (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
 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
   IN PCD_CALLBACK             NotificationFunction\r
   );\r
 \r


@@ -669,7 +668,7 @@ VOID
 EFIAPI\r
 LibPcdCancelCallback (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
 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
   IN PCD_CALLBACK             NotificationFunction\r
   );\r
 \r


@@ -687,14 +686,14 @@ LibPcdCancelCallback (
   @param[in]  The previous PCD token number.  If 0, then retrieves the first PCD \r
               token number.\r
 \r
   @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
 \r
 **/\r

-PCD_TOKEN_NUMBER\r
+UINTN           \r

 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID               *Guid,       OPTIONAL\r

-  IN PCD_TOKEN_NUMBER         TokenNumber\r
+  IN UINTN                    TokenNumber\r

   );\r
 \r
 #endif\r
   );\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Ppi/Pcd.h b/MdePkg/Include/Ppi/Pcd.h
index 1625b8739e81e81adb229bbbd3f1bf4881ce90da..2841f54425b401a8edffbfc0e04f1a74dd56da9b 100644 (file)
--- a/MdePkg/Include/Ppi/Pcd.h
+++ b/MdePkg/Include/Ppi/Pcd.h
@@ -17,142 +17,142 @@
 #ifndef __PCD_H__\r
 #define __PCD_H__\r
 \r
 #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
 extern EFI_GUID gPcdPpiGuid;\r
 \r
 #define PCD_PPI_GUID \\r
   { 0x632df884, 0x8023, 0x4872, { 0xb6, 0x70, 0xb7, 0x4a, 0x30, 0x19, 0x16, 0xe9 } }\r
 \r

+#define PCD_INVALID_TOKEN_NUMBER ((UINTN) -1)\r
+\r

 typedef \r
 VOID\r
 (EFIAPI *PCD_PPI_SET_SKU) (\r
 typedef \r
 VOID\r
 (EFIAPI *PCD_PPI_SET_SKU) (\r

-  IN  SKU_ID          SkuId\r
+  IN  UINTN          SkuId\r

   );\r
 \r
 typedef\r
 UINT8\r
 (EFIAPI *PCD_PPI_GET8) (\r
   );\r
 \r
 typedef\r
 UINT8\r
 (EFIAPI *PCD_PPI_GET8) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINT16\r
 (EFIAPI *PCD_PPI_GET16) (\r
   );\r
 \r
 typedef\r
 UINT16\r
 (EFIAPI *PCD_PPI_GET16) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINT32\r
 (EFIAPI *PCD_PPI_GET32) (\r
   );\r
 \r
 typedef\r
 UINT32\r
 (EFIAPI *PCD_PPI_GET32) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINT64\r
 (EFIAPI *PCD_PPI_GET64) (\r
   );\r
 \r
 typedef\r
 UINT64\r
 (EFIAPI *PCD_PPI_GET64) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 VOID *\r
 (EFIAPI *PCD_PPI_GET_POINTER) (\r
   );\r
 \r
 typedef\r
 VOID *\r
 (EFIAPI *PCD_PPI_GET_POINTER) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 BOOLEAN\r
 (EFIAPI *PCD_PPI_GET_BOOLEAN) (\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
 (EFIAPI *PCD_PPI_GET_BOOLEAN) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINTN\r
 (EFIAPI *PCD_PPI_GET_SIZE) (\r
   );\r
 \r
 typedef\r
 UINTN\r
 (EFIAPI *PCD_PPI_GET_SIZE) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINT8\r
 (EFIAPI *PCD_PPI_GET_EX_8) (\r
   IN CONST EFI_GUID    *Guid,\r
   );\r
 \r
 typedef\r
 UINT8\r
 (EFIAPI *PCD_PPI_GET_EX_8) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINT16\r
 (EFIAPI *PCD_PPI_GET_EX_16) (\r
   IN CONST EFI_GUID    *Guid,\r
   );\r
 \r
 typedef\r
 UINT16\r
 (EFIAPI *PCD_PPI_GET_EX_16) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER   TokenNumber\r
+  IN UINTN              TokenNumber\r

   );\r
 \r
 typedef\r
 UINT32\r
 (EFIAPI *PCD_PPI_GET_EX_32) (\r
   IN CONST EFI_GUID    *Guid,\r
   );\r
 \r
 typedef\r
 UINT32\r
 (EFIAPI *PCD_PPI_GET_EX_32) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINT64\r
 (EFIAPI *PCD_PPI_GET_EX_64) (\r
   IN CONST EFI_GUID    *Guid,\r
   );\r
 \r
 typedef\r
 UINT64\r
 (EFIAPI *PCD_PPI_GET_EX_64) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 VOID *\r
 (EFIAPI *PCD_PPI_GET_EX_POINTER) (\r
   IN CONST EFI_GUID    *Guid,\r
   );\r
 \r
 typedef\r
 VOID *\r
 (EFIAPI *PCD_PPI_GET_EX_POINTER) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 BOOLEAN\r
 (EFIAPI *PCD_PPI_GET_EX_BOOLEAN) (\r
   IN CONST EFI_GUID    *Guid,\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
 (EFIAPI *PCD_PPI_GET_EX_BOOLEAN) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINTN\r
 (EFIAPI *PCD_PPI_GET_EX_SIZE) (\r
   IN CONST EFI_GUID    *Guid,\r
   );\r
 \r
 typedef\r
 UINTN\r
 (EFIAPI *PCD_PPI_GET_EX_SIZE) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET8) (\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET8) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT8             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET16) (\r
   IN UINT8             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET16) (\r

-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r

   IN UINT16             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET32) (\r
   IN UINT16             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET32) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT32            Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET64) (\r
   IN UINT32            Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET64) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT64            Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_POINTER) (\r
   IN UINT64            Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_POINTER) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   );\r
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   );\r


@@ -160,7 +160,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_BOOLEAN) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_BOOLEAN) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN BOOLEAN           Value\r
   );\r
 \r
   IN BOOLEAN           Value\r
   );\r
 \r


@@ -168,7 +168,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_8) (\r
   IN CONST EFI_GUID    *Guid,\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_8) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT8             Value\r
   );\r
 \r
   IN UINT8             Value\r
   );\r
 \r


@@ -176,7 +176,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_16) (\r
   IN CONST EFI_GUID    *Guid,\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_16) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT16            Value\r
   );\r
 \r
   IN UINT16            Value\r
   );\r
 \r


@@ -184,7 +184,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_32) (\r
   IN CONST EFI_GUID    *Guid,\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_32) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT32            Value\r
   );\r
 \r
   IN UINT32            Value\r
   );\r
 \r


@@ -192,7 +192,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_64) (\r
   IN CONST EFI_GUID    *Guid,\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_64) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT64            Value\r
   );\r
 \r
   IN UINT64            Value\r
   );\r
 \r


@@ -200,7 +200,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_POINTER) (\r
   IN CONST EFI_GUID    *Guid,\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_POINTER) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   );\r
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   );\r


@@ -209,7 +209,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_BOOLEAN) (\r
   IN CONST EFI_GUID    *Guid,\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_SET_EX_BOOLEAN) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN BOOLEAN           Value\r
   );\r
 \r
   IN BOOLEAN           Value\r
   );\r
 \r


@@ -228,7 +228,7 @@ typedef
 VOID\r
 (EFIAPI *PCD_PPI_CALLBACK) (\r
   IN      CONST EFI_GUID   *CallBackGuid, OPTIONAL\r
 VOID\r
 (EFIAPI *PCD_PPI_CALLBACK) (\r
   IN      CONST EFI_GUID   *CallBackGuid, OPTIONAL\r

-  IN      PCD_TOKEN_NUMBER CallBackToken,\r
+  IN      UINTN            CallBackToken,\r

   IN  OUT VOID             *TokenData,\r
   IN      UINTN            TokenDataSize\r
   );\r
   IN  OUT VOID             *TokenData,\r
   IN      UINTN            TokenDataSize\r
   );\r


@@ -236,7 +236,7 @@ VOID
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_CALLBACK_ONSET) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_CALLBACK_ONSET) (\r

-  IN  PCD_TOKEN_NUMBER       TokenNumber,\r
+  IN  UINTN                  TokenNumber,\r

   IN  CONST EFI_GUID         *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK       CallBackFunction\r
   );\r
   IN  CONST EFI_GUID         *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK       CallBackFunction\r
   );\r


@@ -244,7 +244,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_CANCEL_CALLBACK) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_CANCEL_CALLBACK) (\r

-  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  UINTN                   TokenNumber,\r

   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK        CallBackFunction\r
   );\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK        CallBackFunction\r
   );\r


@@ -253,7 +253,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_GET_NEXT_TOKEN) (\r
   IN CONST EFI_GUID           *Guid, OPTIONAL\r
 EFI_STATUS\r
 (EFIAPI *PCD_PPI_GET_NEXT_TOKEN) (\r
   IN CONST EFI_GUID           *Guid, OPTIONAL\r

-  IN OUT  PCD_TOKEN_NUMBER    *TokenNumber\r
+  IN OUT  UINTN               *TokenNumber\r

   );\r
 \r
 typedef struct {\r
   );\r
 \r
 typedef struct {\r

diff --git a/MdePkg/Include/Protocol/Pcd.h b/MdePkg/Include/Protocol/Pcd.h
index 3adac6d4ab939b2903488aaf09b9fdd8440dd3cc..323c16ccf1c96a930eab52a6d76cb87222f408b0 100644 (file)
--- a/MdePkg/Include/Protocol/Pcd.h
+++ b/MdePkg/Include/Protocol/Pcd.h
@@ -17,142 +17,142 @@
 #ifndef __PCD_H__\r
 #define __PCD_H__\r
 \r
 #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
 extern EFI_GUID gPcdProtocolGuid;\r
 \r
 #define PCD_PROTOCOL_GUID \\r
   { 0x11b34006, 0xd85b, 0x4d0a, { 0xa2, 0x90, 0xd5, 0xa5, 0x71, 0x31, 0xe, 0xf7 } }\r
 \r

+#define PCD_INVALID_TOKEN_NUMBER ((UINTN) -1)\r
+\r

 typedef \r
 VOID\r
 (EFIAPI *PCD_PROTOCOL_SET_SKU) (\r
 typedef \r
 VOID\r
 (EFIAPI *PCD_PROTOCOL_SET_SKU) (\r

-  IN  SKU_ID                  SkuId\r
+  IN  UINTN                  SkuId\r

   );\r
 \r
 typedef\r
 UINT8\r
 (EFIAPI *PCD_PROTOCOL_GET8) (\r
   );\r
 \r
 typedef\r
 UINT8\r
 (EFIAPI *PCD_PROTOCOL_GET8) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINT16\r
 (EFIAPI *PCD_PROTOCOL_GET16) (\r
   );\r
 \r
 typedef\r
 UINT16\r
 (EFIAPI *PCD_PROTOCOL_GET16) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINT32\r
 (EFIAPI *PCD_PROTOCOL_GET32) (\r
   );\r
 \r
 typedef\r
 UINT32\r
 (EFIAPI *PCD_PROTOCOL_GET32) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINT64\r
 (EFIAPI *PCD_PROTOCOL_GET64) (\r
   );\r
 \r
 typedef\r
 UINT64\r
 (EFIAPI *PCD_PROTOCOL_GET64) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 VOID *\r
 (EFIAPI *PCD_PROTOCOL_GET_POINTER) (\r
   );\r
 \r
 typedef\r
 VOID *\r
 (EFIAPI *PCD_PROTOCOL_GET_POINTER) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 BOOLEAN\r
 (EFIAPI *PCD_PROTOCOL_GET_BOOLEAN) (\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
 (EFIAPI *PCD_PROTOCOL_GET_BOOLEAN) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINTN\r
 (EFIAPI *PCD_PROTOCOL_GET_SIZE) (\r
   );\r
 \r
 typedef\r
 UINTN\r
 (EFIAPI *PCD_PROTOCOL_GET_SIZE) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINT8\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_8) (\r
   IN CONST EFI_GUID    *Guid,\r
   );\r
 \r
 typedef\r
 UINT8\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_8) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINT16\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_16) (\r
   IN CONST EFI_GUID    *Guid,\r
   );\r
 \r
 typedef\r
 UINT16\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_16) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINT32\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_32) (\r
   IN CONST EFI_GUID    *Guid,\r
   );\r
 \r
 typedef\r
 UINT32\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_32) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINT64\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_64) (\r
   IN CONST EFI_GUID    *Guid,\r
   );\r
 \r
 typedef\r
 UINT64\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_64) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 VOID *\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_POINTER) (\r
   IN CONST EFI_GUID    *Guid,\r
   );\r
 \r
 typedef\r
 VOID *\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_POINTER) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 BOOLEAN\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_BOOLEAN) (\r
   IN CONST EFI_GUID    *Guid,\r
   );\r
 \r
 typedef\r
 BOOLEAN\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_BOOLEAN) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 UINTN\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_SIZE) (\r
   IN CONST EFI_GUID    *Guid,\r
   );\r
 \r
 typedef\r
 UINTN\r
 (EFIAPI *PCD_PROTOCOL_GET_EX_SIZE) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET8) (\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET8) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT8             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET16) (\r
   IN UINT8             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET16) (\r

-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r

   IN UINT16             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET32) (\r
   IN UINT16             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET32) (\r

-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r

   IN UINT32             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET64) (\r
   IN UINT32             Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET64) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT64            Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_POINTER) (\r
   IN UINT64            Value\r
   );\r
 \r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_POINTER) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   );\r
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   );\r


@@ -160,7 +160,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_BOOLEAN) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_BOOLEAN) (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN BOOLEAN           Value\r
   );\r
 \r
   IN BOOLEAN           Value\r
   );\r
 \r


@@ -168,7 +168,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_8) (\r
   IN CONST EFI_GUID    *Guid,\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_8) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT8             Value\r
   );\r
 \r
   IN UINT8             Value\r
   );\r
 \r


@@ -176,7 +176,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_16) (\r
   IN CONST EFI_GUID    *Guid,\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_16) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT16            Value\r
   );\r
 \r
   IN UINT16            Value\r
   );\r
 \r


@@ -184,7 +184,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_32) (\r
   IN CONST EFI_GUID     *Guid,\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_32) (\r
   IN CONST EFI_GUID     *Guid,\r

-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r

   IN UINT32             Value\r
   );\r
 \r
   IN UINT32             Value\r
   );\r
 \r


@@ -192,7 +192,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_64) (\r
   IN CONST EFI_GUID    *Guid,\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_64) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT64            Value\r
   );\r
 \r
   IN UINT64            Value\r
   );\r
 \r


@@ -200,7 +200,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_POINTER) (\r
   IN CONST EFI_GUID    *Guid,\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_POINTER) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   );\r
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   );\r


@@ -209,7 +209,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_BOOLEAN) (\r
   IN CONST EFI_GUID    *Guid,\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_SET_EX_BOOLEAN) (\r
   IN CONST EFI_GUID    *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN BOOLEAN           Value\r
   );\r
   \r
   IN BOOLEAN           Value\r
   );\r
   \r


@@ -228,7 +228,7 @@ typedef
 VOID\r
 (EFIAPI *PCD_PROTOCOL_CALLBACK) (\r
   IN      CONST EFI_GUID   *CallBackGuid, OPTIONAL\r
 VOID\r
 (EFIAPI *PCD_PROTOCOL_CALLBACK) (\r
   IN      CONST EFI_GUID   *CallBackGuid, OPTIONAL\r

-  IN      PCD_TOKEN_NUMBER            CallBackToken,\r
+  IN      UINTN                       CallBackToken,\r

   IN  OUT VOID             *TokenData,\r
   IN      UINTN            TokenDataSize\r
   );\r
   IN  OUT VOID             *TokenData,\r
   IN      UINTN            TokenDataSize\r
   );\r


@@ -236,7 +236,7 @@ VOID
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_CALLBACK_ONSET) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_CALLBACK_ONSET) (\r

-  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  UINTN                   TokenNumber,\r

   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   );\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   );\r


@@ -244,7 +244,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_CANCEL_CALLBACK) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_CANCEL_CALLBACK) (\r

-  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  UINTN                   TokenNumber,\r

   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   );\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   );\r


@@ -253,7 +253,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_GET_NEXT_TOKEN) (\r
   IN      CONST EFI_GUID      *Guid, OPTIONAL\r
 EFI_STATUS\r
 (EFIAPI *PCD_PROTOCOL_GET_NEXT_TOKEN) (\r
   IN      CONST EFI_GUID      *Guid, OPTIONAL\r

-  IN OUT  PCD_TOKEN_NUMBER    *TokenNumber\r
+  IN OUT  UINTN               *TokenNumber\r

   );\r
 \r
 typedef struct {\r
   );\r
 \r
 typedef struct {\r

diff --git a/MdePkg/Library/BasePcdLibNull/PcdLib.c b/MdePkg/Library/BasePcdLibNull/PcdLib.c
index a4e01839642fa6c8f9f2e382f6aca83cdd75575a..1dcb6fe0ba7b896588e3997a3eb1d14aa50f73e4 100644 (file)
--- a/MdePkg/Library/BasePcdLibNull/PcdLib.c
+++ b/MdePkg/Library/BasePcdLibNull/PcdLib.c
@@ -25,10 +25,10 @@
   @retval SKU_ID Return the SKU ID that just be set.\r
 \r
 **/\r
   @retval SKU_ID Return the SKU ID that just be set.\r
 \r
 **/\r

-SKU_ID\r
+UINTN           \r

 EFIAPI\r
 LibPcdSetSku (\r
 EFIAPI\r
 LibPcdSetSku (\r

-  IN SKU_ID  SkuId\r
+  IN UINTN  SkuId\r

   )\r
 {\r
   return SkuId;\r
   )\r
 {\r
   return SkuId;\r


@@ -47,7 +47,7 @@ LibPcdSetSku (
 UINT8\r
 EFIAPI\r
 LibPcdGet8 (\r
 UINT8\r
 EFIAPI\r
 LibPcdGet8 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return 0;\r
   )\r
 {\r
   return 0;\r


@@ -66,7 +66,7 @@ LibPcdGet8 (
 UINT16\r
 EFIAPI\r
 LibPcdGet16 (\r
 UINT16\r
 EFIAPI\r
 LibPcdGet16 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return 0;\r
   )\r
 {\r
   return 0;\r


@@ -85,7 +85,7 @@ LibPcdGet16 (
 UINT32\r
 EFIAPI\r
 LibPcdGet32 (\r
 UINT32\r
 EFIAPI\r
 LibPcdGet32 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return 0;\r
   )\r
 {\r
   return 0;\r


@@ -104,7 +104,7 @@ LibPcdGet32 (
 UINT64\r
 EFIAPI\r
 LibPcdGet64 (\r
 UINT64\r
 EFIAPI\r
 LibPcdGet64 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return 0;\r
   )\r
 {\r
   return 0;\r


@@ -123,7 +123,7 @@ LibPcdGet64 (
 VOID *\r
 EFIAPI\r
 LibPcdGetPtr (\r
 VOID *\r
 EFIAPI\r
 LibPcdGetPtr (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return 0;\r
   )\r
 {\r
   return 0;\r


@@ -142,7 +142,7 @@ LibPcdGetPtr (
 BOOLEAN \r
 EFIAPI\r
 LibPcdGetBool (\r
 BOOLEAN \r
 EFIAPI\r
 LibPcdGetBool (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return 0;\r
   )\r
 {\r
   return 0;\r


@@ -161,7 +161,7 @@ LibPcdGetBool (
 UINTN\r
 EFIAPI\r
 LibPcdGetSize (\r
 UINTN\r
 EFIAPI\r
 LibPcdGetSize (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return 0;\r
   )\r
 {\r
   return 0;\r


@@ -184,7 +184,7 @@ UINT8
 EFIAPI\r
 LibPcdGetEx8 (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetEx8 (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

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


@@ -209,7 +209,7 @@ UINT16
 EFIAPI\r
 LibPcdGetEx16 (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetEx16 (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

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


@@ -234,7 +234,7 @@ UINT32
 EFIAPI\r
 LibPcdGetEx32 (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetEx32 (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

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


@@ -259,7 +259,7 @@ UINT64
 EFIAPI\r
 LibPcdGetEx64 (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetEx64 (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

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


@@ -284,7 +284,7 @@ VOID *
 EFIAPI\r
 LibPcdGetExPtr (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetExPtr (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

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


@@ -309,7 +309,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdGetExBool (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetExBool (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

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


@@ -334,7 +334,7 @@ UINTN
 EFIAPI\r
 LibPcdGetExSize (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetExSize (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

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


@@ -357,7 +357,7 @@ LibPcdGetExSize (
 UINT8\r
 EFIAPI\r
 LibPcdSet8 (\r
 UINT8\r
 EFIAPI\r
 LibPcdSet8 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT8             Value\r
   )\r
 {\r
   IN UINT8             Value\r
   )\r
 {\r


@@ -379,7 +379,7 @@ LibPcdSet8 (
 UINT16\r
 EFIAPI\r
 LibPcdSet16 (\r
 UINT16\r
 EFIAPI\r
 LibPcdSet16 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT16            Value\r
   )\r
 {\r
   IN UINT16            Value\r
   )\r
 {\r


@@ -401,7 +401,7 @@ LibPcdSet16 (
 UINT32\r
 EFIAPI\r
 LibPcdSet32 (\r
 UINT32\r
 EFIAPI\r
 LibPcdSet32 (\r

-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r

   IN UINT32             Value\r
   )\r
 {\r
   IN UINT32             Value\r
   )\r
 {\r


@@ -423,7 +423,7 @@ LibPcdSet32 (
 UINT64\r
 EFIAPI\r
 LibPcdSet64 (\r
 UINT64\r
 EFIAPI\r
 LibPcdSet64 (\r

-  IN PCD_TOKEN_NUMBER   TokenNumber,\r
+  IN UINTN              TokenNumber,\r

   IN UINT64             Value\r
   )\r
 {\r
   IN UINT64             Value\r
   )\r
 {\r


@@ -446,7 +446,7 @@ LibPcdSet64 (
 VOID *\r
 EFIAPI\r
 LibPcdSetPtr (\r
 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
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   )\r


@@ -471,7 +471,7 @@ LibPcdSetPtr (
 BOOLEAN\r
 EFIAPI\r
 LibPcdSetBool (\r
 BOOLEAN\r
 EFIAPI\r
 LibPcdSetBool (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN BOOLEAN           Value\r
   )\r
 {\r
   IN BOOLEAN           Value\r
   )\r
 {\r


@@ -497,7 +497,7 @@ UINT8
 EFIAPI\r
 LibPcdSetEx8 (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINT8             Value\r
   )\r
 {\r


@@ -525,7 +525,7 @@ UINT16
 EFIAPI\r
 LibPcdSetEx16 (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINT16            Value\r
   )\r
 {\r


@@ -553,7 +553,7 @@ UINT32
 EFIAPI\r
 LibPcdSetEx32 (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINT32            Value\r
   )\r
 {\r


@@ -581,7 +581,7 @@ UINT64
 EFIAPI\r
 LibPcdSetEx64 (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINT64            Value\r
   )\r
 {\r


@@ -610,7 +610,7 @@ VOID *
 EFIAPI\r
 LibPcdSetExPtr (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   )\r


@@ -640,7 +640,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdSetExBool (\r
   IN CONST GUID        *Guid,\r
 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
   IN BOOLEAN           Value\r
   )\r
 {\r


@@ -671,7 +671,7 @@ VOID
 EFIAPI\r
 LibPcdCallbackOnSet (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
 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
   IN PCD_CALLBACK             NotificationFunction\r
   )\r
 {\r


@@ -695,7 +695,7 @@ VOID
 EFIAPI\r
 LibPcdCancelCallback (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
 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
   IN PCD_CALLBACK             NotificationFunction\r
   )\r
 {\r


@@ -717,14 +717,14 @@ LibPcdCancelCallback (
   @param[in]  The previous PCD token number.  If 0, then retrieves the first PCD \r
               token number.\r
 \r
   @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
 \r
 **/\r

-PCD_TOKEN_NUMBER\r
+UINTN           \r

 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID               *Guid, OPTIONAL\r
 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID               *Guid, OPTIONAL\r

-  IN       PCD_TOKEN_NUMBER   TokenNumber\r
+  IN       UINTN              TokenNumber\r

   )\r
 {\r
   return 0;\r
   )\r
 {\r
   return 0;\r

diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.c b/MdePkg/Library/DxePcdLib/DxePcdLib.c
index f3818a6e7e8f0e64870167b14ae9a0f9fbe18ee1..c20fad23023a0474bbf0dfbea03de7d34a1ae7cc 100644 (file)
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.c
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.c
@@ -51,10 +51,10 @@ PcdLibConstructor (
   @retval SKU_ID Return the SKU ID that just be set.\r
 \r
 **/\r
   @retval SKU_ID Return the SKU ID that just be set.\r
 \r
 **/\r

-SKU_ID\r
+UINTN\r

 EFIAPI\r
 LibPcdSetSku (\r
 EFIAPI\r
 LibPcdSetSku (\r

-  IN SKU_ID  SkuId\r
+  IN UINTN  SkuId\r

   )\r
 {\r
   mPcd->SetSku (SkuId);\r
   )\r
 {\r
   mPcd->SetSku (SkuId);\r


@@ -75,7 +75,7 @@ LibPcdSetSku (
 UINT8\r
 EFIAPI\r
 LibPcdGet8 (\r
 UINT8\r
 EFIAPI\r
 LibPcdGet8 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return mPcd->Get8 (TokenNumber);\r
   )\r
 {\r
   return mPcd->Get8 (TokenNumber);\r


@@ -94,7 +94,7 @@ LibPcdGet8 (
 UINT16\r
 EFIAPI\r
 LibPcdGet16 (\r
 UINT16\r
 EFIAPI\r
 LibPcdGet16 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return mPcd->Get16 (TokenNumber);\r
   )\r
 {\r
   return mPcd->Get16 (TokenNumber);\r


@@ -113,7 +113,7 @@ LibPcdGet16 (
 UINT32\r
 EFIAPI\r
 LibPcdGet32 (\r
 UINT32\r
 EFIAPI\r
 LibPcdGet32 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return mPcd->Get32 (TokenNumber);\r
   )\r
 {\r
   return mPcd->Get32 (TokenNumber);\r


@@ -132,7 +132,7 @@ LibPcdGet32 (
 UINT64\r
 EFIAPI\r
 LibPcdGet64 (\r
 UINT64\r
 EFIAPI\r
 LibPcdGet64 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return mPcd->Get64 (TokenNumber);\r
   )\r
 {\r
   return mPcd->Get64 (TokenNumber);\r


@@ -151,7 +151,7 @@ LibPcdGet64 (
 VOID *\r
 EFIAPI\r
 LibPcdGetPtr (\r
 VOID *\r
 EFIAPI\r
 LibPcdGetPtr (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return mPcd->GetPtr (TokenNumber);\r
   )\r
 {\r
   return mPcd->GetPtr (TokenNumber);\r


@@ -170,7 +170,7 @@ LibPcdGetPtr (
 BOOLEAN \r
 EFIAPI\r
 LibPcdGetBool (\r
 BOOLEAN \r
 EFIAPI\r
 LibPcdGetBool (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return mPcd->GetBool (TokenNumber);\r
   )\r
 {\r
   return mPcd->GetBool (TokenNumber);\r


@@ -189,7 +189,7 @@ LibPcdGetBool (
 UINTN\r
 EFIAPI\r
 LibPcdGetSize (\r
 UINTN\r
 EFIAPI\r
 LibPcdGetSize (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

   )\r
 {\r
   return mPcd->GetSize (TokenNumber);\r
   )\r
 {\r
   return mPcd->GetSize (TokenNumber);\r


@@ -212,7 +212,7 @@ UINT8
 EFIAPI\r
 LibPcdGetEx8 (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetEx8 (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

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


@@ -236,7 +236,7 @@ UINT16
 EFIAPI\r
 LibPcdGetEx16 (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetEx16 (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

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


@@ -260,7 +260,7 @@ UINT32
 EFIAPI\r
 LibPcdGetEx32 (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetEx32 (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

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


@@ -285,7 +285,7 @@ UINT64
 EFIAPI\r
 LibPcdGetEx64 (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetEx64 (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

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


@@ -310,7 +310,7 @@ VOID *
 EFIAPI\r
 LibPcdGetExPtr (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetExPtr (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

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


@@ -335,7 +335,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdGetExBool (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetExBool (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

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


@@ -360,7 +360,7 @@ UINTN
 EFIAPI\r
 LibPcdGetExSize (\r
   IN CONST GUID        *Guid,\r
 EFIAPI\r
 LibPcdGetExSize (\r
   IN CONST GUID        *Guid,\r

-  IN PCD_TOKEN_NUMBER  TokenNumber\r
+  IN UINTN             TokenNumber\r

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


@@ -383,7 +383,7 @@ LibPcdGetExSize (
 UINT8\r
 EFIAPI\r
 LibPcdSet8 (\r
 UINT8\r
 EFIAPI\r
 LibPcdSet8 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT8             Value\r
   )\r
 {\r
   IN UINT8             Value\r
   )\r
 {\r


@@ -411,7 +411,7 @@ LibPcdSet8 (
 UINT16\r
 EFIAPI\r
 LibPcdSet16 (\r
 UINT16\r
 EFIAPI\r
 LibPcdSet16 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT16            Value\r
   )\r
 {\r
   IN UINT16            Value\r
   )\r
 {\r


@@ -439,7 +439,7 @@ LibPcdSet16 (
 UINT32\r
 EFIAPI\r
 LibPcdSet32 (\r
 UINT32\r
 EFIAPI\r
 LibPcdSet32 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT32             Value\r
   )\r
 {\r
   IN UINT32             Value\r
   )\r
 {\r


@@ -466,7 +466,7 @@ LibPcdSet32 (
 UINT64\r
 EFIAPI\r
 LibPcdSet64 (\r
 UINT64\r
 EFIAPI\r
 LibPcdSet64 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT64             Value\r
   )\r
 {\r
   IN UINT64             Value\r
   )\r
 {\r


@@ -495,7 +495,7 @@ LibPcdSet64 (
 VOID *\r
 EFIAPI\r
 LibPcdSetPtr (\r
 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
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   )\r


@@ -526,7 +526,7 @@ LibPcdSetPtr (
 BOOLEAN\r
 EFIAPI\r
 LibPcdSetBool (\r
 BOOLEAN\r
 EFIAPI\r
 LibPcdSetBool (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN BOOLEAN           Value\r
   )\r
 {\r
   IN BOOLEAN           Value\r
   )\r
 {\r


@@ -558,7 +558,7 @@ UINT8
 EFIAPI\r
 LibPcdSetEx8 (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINT8             Value\r
   )\r
 {\r


@@ -592,7 +592,7 @@ UINT16
 EFIAPI\r
 LibPcdSetEx16 (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINT16            Value\r
   )\r
 {\r


@@ -626,7 +626,7 @@ UINT32
 EFIAPI\r
 LibPcdSetEx32 (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINT32             Value\r
   )\r
 {\r


@@ -660,7 +660,7 @@ UINT64
 EFIAPI\r
 LibPcdSetEx64 (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINT64             Value\r
   )\r
 {\r


@@ -695,7 +695,7 @@ VOID *
 EFIAPI\r
 LibPcdSetExPtr (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   )\r


@@ -731,7 +731,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdSetExBool (\r
   IN CONST GUID        *Guid,\r
 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
   IN BOOLEAN           Value\r
   )\r
 {\r


@@ -768,7 +768,7 @@ VOID
 EFIAPI\r
 LibPcdCallbackOnSet (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
 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
   IN PCD_CALLBACK             NotificationFunction\r
   )\r
 {\r


@@ -800,7 +800,7 @@ VOID
 EFIAPI\r
 LibPcdCancelCallback (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
 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
   IN PCD_CALLBACK             NotificationFunction\r
   )\r
 {\r


@@ -830,14 +830,14 @@ LibPcdCancelCallback (
   @param[in]  The previous PCD token number.  If 0, then retrieves the first PCD \r
               token number.\r
 \r
   @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
 \r
 **/\r

-PCD_TOKEN_NUMBER           \r
+UINTN                      \r

 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID             *Guid, OPTIONAL\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
   )\r
 {\r
   EFI_STATUS Status;\r

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
   @retval SKU_ID Return the SKU ID that just be set.\r
 \r
 **/\r

-SKU_ID\r
+UINTN\r

 EFIAPI\r
 LibPcdSetSku (\r
 EFIAPI\r
 LibPcdSetSku (\r

-  IN SKU_ID  SkuId\r
+  IN UINTN  SkuId\r

   )\r
 {\r
 \r
   )\r
 {\r
 \r


@@ -86,7 +86,7 @@ LibPcdSetSku (
 UINT8\r
 EFIAPI\r
 LibPcdGet8 (\r
 UINT8\r
 EFIAPI\r
 LibPcdGet8 (\r

-  IN PCD_TOKEN_NUMBER             TokenNumber\r
+  IN UINTN                        TokenNumber\r

   )\r
 {\r
   PCD_PPI * PcdPpi;\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r


@@ -109,7 +109,7 @@ LibPcdGet8 (
 UINT16\r
 EFIAPI\r
 LibPcdGet16 (\r
 UINT16\r
 EFIAPI\r
 LibPcdGet16 (\r

-  IN PCD_TOKEN_NUMBER             TokenNumber\r
+  IN UINTN                        TokenNumber\r

   )\r
 {\r
   PCD_PPI  *PcdPpi;\r
   )\r
 {\r
   PCD_PPI  *PcdPpi;\r


@@ -132,7 +132,7 @@ LibPcdGet16 (
 UINT32\r
 EFIAPI\r
 LibPcdGet32 (\r
 UINT32\r
 EFIAPI\r
 LibPcdGet32 (\r

-  IN PCD_TOKEN_NUMBER             TokenNumber\r
+  IN UINTN                        TokenNumber\r

   )\r
 {\r
   PCD_PPI * PcdPpi;\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r


@@ -155,7 +155,7 @@ LibPcdGet32 (
 UINT64\r
 EFIAPI\r
 LibPcdGet64 (\r
 UINT64\r
 EFIAPI\r
 LibPcdGet64 (\r

-  IN PCD_TOKEN_NUMBER             TokenNumber\r
+  IN UINTN                        TokenNumber\r

   )\r
 {\r
   PCD_PPI * PcdPpi;\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r


@@ -178,7 +178,7 @@ LibPcdGet64 (
 VOID *\r
 EFIAPI\r
 LibPcdGetPtr (\r
 VOID *\r
 EFIAPI\r
 LibPcdGetPtr (\r

-  IN PCD_TOKEN_NUMBER             TokenNumber\r
+  IN UINTN                        TokenNumber\r

   )\r
 {\r
   PCD_PPI * PcdPpi;\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r


@@ -201,7 +201,7 @@ LibPcdGetPtr (
 BOOLEAN \r
 EFIAPI\r
 LibPcdGetBool (\r
 BOOLEAN \r
 EFIAPI\r
 LibPcdGetBool (\r

-  IN PCD_TOKEN_NUMBER             TokenNumber\r
+  IN UINTN                        TokenNumber\r

   )\r
 {\r
   PCD_PPI * PcdPpi;\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r


@@ -224,7 +224,7 @@ LibPcdGetBool (
 UINTN\r
 EFIAPI\r
 LibPcdGetSize (\r
 UINTN\r
 EFIAPI\r
 LibPcdGetSize (\r

-  IN PCD_TOKEN_NUMBER             TokenNumber\r
+  IN UINTN                        TokenNumber\r

   )\r
 {\r
   PCD_PPI * PcdPpi;\r
   )\r
 {\r
   PCD_PPI * PcdPpi;\r


@@ -251,7 +251,7 @@ UINT8
 EFIAPI\r
 LibPcdGetEx8 (\r
   IN CONST GUID        *Guid,\r
 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
   )\r
 {\r
   PCD_PPI * PcdPpi;\r


@@ -278,7 +278,7 @@ UINT16
 EFIAPI\r
 LibPcdGetEx16 (\r
   IN CONST GUID        *Guid,\r
 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
   )\r
 {\r
   PCD_PPI * PcdPpi;\r


@@ -305,7 +305,7 @@ UINT32
 EFIAPI\r
 LibPcdGetEx32 (\r
   IN CONST GUID        *Guid,\r
 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
   )\r
 {\r
   PCD_PPI * PcdPpi;\r


@@ -333,7 +333,7 @@ UINT64
 EFIAPI\r
 LibPcdGetEx64 (\r
   IN CONST GUID        *Guid,\r
 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
   )\r
 {\r
   PCD_PPI * PcdPpi;\r


@@ -360,7 +360,7 @@ VOID *
 EFIAPI\r
 LibPcdGetExPtr (\r
   IN CONST GUID        *Guid,\r
 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
   )\r
 {\r
   PCD_PPI * PcdPpi;\r


@@ -387,7 +387,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdGetExBool (\r
   IN CONST GUID        *Guid,\r
 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
   )\r
 {\r
   PCD_PPI * PcdPpi;\r


@@ -414,7 +414,7 @@ UINTN
 EFIAPI\r
 LibPcdGetExSize (\r
   IN CONST GUID        *Guid,\r
 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
   )\r
 {\r
   PCD_PPI * PcdPpi;\r


@@ -439,7 +439,7 @@ LibPcdGetExSize (
 UINT8\r
 EFIAPI\r
 LibPcdSet8 (\r
 UINT8\r
 EFIAPI\r
 LibPcdSet8 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT8             Value\r
   )\r
 {\r
   IN UINT8             Value\r
   )\r
 {\r


@@ -471,7 +471,7 @@ LibPcdSet8 (
 UINT16\r
 EFIAPI\r
 LibPcdSet16 (\r
 UINT16\r
 EFIAPI\r
 LibPcdSet16 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT16            Value\r
   )\r
 {\r
   IN UINT16            Value\r
   )\r
 {\r


@@ -503,7 +503,7 @@ LibPcdSet16 (
 UINT32\r
 EFIAPI\r
 LibPcdSet32 (\r
 UINT32\r
 EFIAPI\r
 LibPcdSet32 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT32             Value\r
   )\r
 {\r
   IN UINT32             Value\r
   )\r
 {\r


@@ -534,7 +534,7 @@ LibPcdSet32 (
 UINT64\r
 EFIAPI\r
 LibPcdSet64 (\r
 UINT64\r
 EFIAPI\r
 LibPcdSet64 (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN UINT64             Value\r
   )\r
 {\r
   IN UINT64             Value\r
   )\r
 {\r


@@ -567,7 +567,7 @@ LibPcdSet64 (
 VOID *\r
 EFIAPI\r
 LibPcdSetPtr (\r
 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
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   )\r


@@ -600,7 +600,7 @@ LibPcdSetPtr (
 BOOLEAN\r
 EFIAPI\r
 LibPcdSetBool (\r
 BOOLEAN\r
 EFIAPI\r
 LibPcdSetBool (\r

-  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN UINTN             TokenNumber,\r

   IN BOOLEAN           Value\r
   )\r
 {\r
   IN BOOLEAN           Value\r
   )\r
 {\r


@@ -636,7 +636,7 @@ UINT8
 EFIAPI\r
 LibPcdSetEx8 (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINT8             Value\r
   )\r
 {\r


@@ -672,7 +672,7 @@ UINT16
 EFIAPI\r
 LibPcdSetEx16 (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINT16            Value\r
   )\r
 {\r


@@ -708,7 +708,7 @@ UINT32
 EFIAPI\r
 LibPcdSetEx32 (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINT32             Value\r
   )\r
 {\r


@@ -744,7 +744,7 @@ UINT64
 EFIAPI\r
 LibPcdSetEx64 (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINT64            Value\r
   )\r
 {\r


@@ -781,7 +781,7 @@ VOID *
 EFIAPI\r
 LibPcdSetExPtr (\r
   IN CONST GUID        *Guid,\r
 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
   IN UINTN             SizeOfBuffer,\r
   IN VOID              *Buffer\r
   )\r


@@ -817,7 +817,7 @@ BOOLEAN
 EFIAPI\r
 LibPcdSetExBool (\r
   IN CONST GUID        *Guid,\r
 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
   IN BOOLEAN           Value\r
   )\r
 {\r


@@ -856,7 +856,7 @@ VOID
 EFIAPI\r
 LibPcdCallbackOnSet (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
 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
   IN PCD_CALLBACK             NotificationFunction\r
   )\r
 {\r


@@ -890,7 +890,7 @@ VOID
 EFIAPI\r
 LibPcdCancelCallback (\r
   IN CONST GUID               *Guid,       OPTIONAL\r
 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
   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
   @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
 \r
 **/\r

-PCD_TOKEN_NUMBER           \r
+UINTN                      \r

 EFIAPI\r
 LibPcdGetNextToken (\r
   IN CONST GUID             *Guid, OPTIONAL\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
   )\r
 {\r
   EFI_STATUS Status;\r

diff --git a/Tools/Conf/Pcd/PcdDatabaseCommonDefinitions.sample b/Tools/Conf/Pcd/PcdDatabaseCommonDefinitions.sample
index 9b7d7d319fbe03aa63b575e32dba76eec1357ffb..d441aa0515d9428a2f8e1ddeabae680a5394c4e3 100644 (file)
--- a/Tools/Conf/Pcd/PcdDatabaseCommonDefinitions.sample
+++ b/Tools/Conf/Pcd/PcdDatabaseCommonDefinitions.sample
@@ -5,6 +5,8 @@
 //\r
 // Common definitions\r
 //\r
 //\r
 // Common definitions\r
 //\r

+typedef UINT8 SKU_ID;\r
+\r

 #define PCD_TYPE_SHIFT        24\r
 \r
 \r
 #define PCD_TYPE_SHIFT        24\r
 \r
 \r