summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--EdkModulePkg/Universal/PCD/Dxe/Pcd.c64
-rw-r--r--EdkModulePkg/Universal/PCD/Dxe/Service.c24
-rw-r--r--EdkModulePkg/Universal/PCD/Dxe/Service.h80
-rw-r--r--EdkModulePkg/Universal/PCD/Pei/Pcd.c62
-rw-r--r--EdkModulePkg/Universal/PCD/Pei/Service.c16
-rw-r--r--EdkModulePkg/Universal/PCD/Pei/Service.h74
-rw-r--r--MdePkg/Include/Library/PcdLib.h75
-rw-r--r--MdePkg/Include/Ppi/Pcd.h66
-rw-r--r--MdePkg/Include/Protocol/Pcd.h66
-rw-r--r--MdePkg/Library/BasePcdLibNull/PcdLib.c66
-rw-r--r--MdePkg/Library/DxePcdLib/DxePcdLib.c66
-rw-r--r--MdePkg/Library/PeiPcdLib/PeiPcdLib.c66
-rw-r--r--Tools/Conf/Pcd/PcdDatabaseCommonDefinitions.sample2
13 files changed, 364 insertions, 363 deletions
diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
index 64191a7161..ffb62256c3 100644
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -100,10 +100,10 @@ PcdDxeInit (
VOID
EFIAPI
DxePcdSetSku (
- IN SKU_ID SkuId
+ IN UINTN SkuId
)
{
- mPcdDatabase->PeiDb.Init.SystemSkuId = SkuId;
+ mPcdDatabase->PeiDb.Init.SystemSkuId = (SKU_ID) SkuId;
return;
}
@@ -113,7 +113,7 @@ DxePcdSetSku (
UINT8
EFIAPI
DxePcdGet8 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return *((UINT8 *) GetWorker (TokenNumber, sizeof (UINT8)));
@@ -124,7 +124,7 @@ DxePcdGet8 (
UINT16
EFIAPI
DxePcdGet16 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return ReadUnaligned16 (GetWorker (TokenNumber, sizeof (UINT16)));
@@ -135,7 +135,7 @@ DxePcdGet16 (
UINT32
EFIAPI
DxePcdGet32 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return ReadUnaligned32 (GetWorker (TokenNumber, sizeof (UINT32)));
@@ -146,7 +146,7 @@ DxePcdGet32 (
UINT64
EFIAPI
DxePcdGet64 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return ReadUnaligned64(GetWorker (TokenNumber, sizeof (UINT64)));
@@ -157,7 +157,7 @@ DxePcdGet64 (
VOID *
EFIAPI
DxePcdGetPtr (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return GetWorker (TokenNumber, 0);
@@ -168,7 +168,7 @@ DxePcdGetPtr (
BOOLEAN
EFIAPI
DxePcdGetBool (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return *((BOOLEAN *) GetWorker (TokenNumber, sizeof (BOOLEAN)));
@@ -179,7 +179,7 @@ DxePcdGetBool (
UINTN
EFIAPI
DxePcdGetSize (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
UINT16 * SizeTable;
@@ -199,7 +199,7 @@ UINT8
EFIAPI
DxePcdGet8Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
{
return *((UINT8 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT8)));
@@ -211,7 +211,7 @@ UINT16
EFIAPI
DxePcdGet16Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
{
return ReadUnaligned16 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT16)));
@@ -223,7 +223,7 @@ UINT32
EFIAPI
DxePcdGet32Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
{
return ReadUnaligned32 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT32)));
@@ -235,7 +235,7 @@ UINT64
EFIAPI
DxePcdGet64Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
{
return ReadUnaligned64 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT64)));
@@ -247,7 +247,7 @@ VOID *
EFIAPI
DxePcdGetPtrEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
{
return ExGetWorker (Guid, ExTokenNumber, 0);
@@ -259,7 +259,7 @@ BOOLEAN
EFIAPI
DxePcdGetBoolEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
{
return *((BOOLEAN *) ExGetWorker (Guid, ExTokenNumber, sizeof(BOOLEAN)));
@@ -271,7 +271,7 @@ UINTN
EFIAPI
DxePcdGetSizeEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
{
return DxePcdGetSize(GetExPcdTokenNumber (Guid, ExTokenNumber));
@@ -282,7 +282,7 @@ DxePcdGetSizeEx (
EFI_STATUS
EFIAPI
DxePcdSet8 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
)
{
@@ -294,7 +294,7 @@ DxePcdSet8 (
EFI_STATUS
EFIAPI
DxePcdSet16 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
)
{
@@ -306,7 +306,7 @@ DxePcdSet16 (
EFI_STATUS
EFIAPI
DxePcdSet32 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
)
{
@@ -318,7 +318,7 @@ DxePcdSet32 (
EFI_STATUS
EFIAPI
DxePcdSet64 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
)
{
@@ -330,7 +330,7 @@ DxePcdSet64 (
EFI_STATUS
EFIAPI
DxePcdSetPtr (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
)
@@ -343,7 +343,7 @@ DxePcdSetPtr (
EFI_STATUS
EFIAPI
DxePcdSetBool (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
)
{
@@ -356,7 +356,7 @@ EFI_STATUS
EFIAPI
DxePcdSet8Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN UINT8 Value
)
{
@@ -375,7 +375,7 @@ EFI_STATUS
EFIAPI
DxePcdSet16Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN UINT16 Value
)
{
@@ -394,7 +394,7 @@ EFI_STATUS
EFIAPI
DxePcdSet32Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN UINT32 Value
)
{
@@ -413,7 +413,7 @@ EFI_STATUS
EFIAPI
DxePcdSet64Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN UINT64 Value
)
{
@@ -432,7 +432,7 @@ EFI_STATUS
EFIAPI
DxePcdSetPtrEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
)
@@ -452,7 +452,7 @@ EFI_STATUS
EFIAPI
DxePcdSetBoolEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN BOOLEAN Value
)
{
@@ -471,7 +471,7 @@ DxePcdSetBoolEx (
EFI_STATUS
EFIAPI
DxeRegisterCallBackOnSet (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN CONST EFI_GUID *Guid, OPTIONAL
IN PCD_PROTOCOL_CALLBACK CallBackFunction
)
@@ -486,7 +486,7 @@ DxeRegisterCallBackOnSet (
EFI_STATUS
EFIAPI
DxeUnRegisterCallBackOnSet (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN CONST EFI_GUID *Guid, OPTIONAL
IN PCD_PROTOCOL_CALLBACK CallBackFunction
)
@@ -502,10 +502,10 @@ EFI_STATUS
EFIAPI
DxePcdGetNextToken (
IN CONST EFI_GUID *Guid, OPTIONAL
- IN OUT PCD_TOKEN_NUMBER *TokenNumber
+ IN OUT UINTN *TokenNumber
)
{
- PCD_TOKEN_NUMBER ExTokenNumber;
+ UINTN ExTokenNumber;
//
// Scan the local token space
diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c
index 00437f116c..8cb08dcd7c 100644
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -28,7 +28,7 @@ LIST_ENTRY *mCallbackFnTable;
VOID *
GetWorker (
- PCD_TOKEN_NUMBER TokenNumber,
+ UINTN TokenNumber,
UINTN GetSize
)
{
@@ -124,7 +124,7 @@ GetWorker (
EFI_STATUS
DxeRegisterCallBackWorker (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN CONST GUID *Guid, OPTIONAL
IN PCD_PROTOCOL_CALLBACK CallBackFunction
)
@@ -167,7 +167,7 @@ DxeRegisterCallBackWorker (
EFI_STATUS
DxeUnRegisterCallBackWorker (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN CONST GUID *Guid, OPTIONAL
IN PCD_PROTOCOL_CALLBACK CallBackFunction
)
@@ -205,10 +205,10 @@ DxeUnRegisterCallBackWorker (
-PCD_TOKEN_NUMBER
+UINTN
ExGetNextTokeNumber (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN EFI_GUID *GuidTable,
IN UINTN SizeOfGuidTable,
IN DYNAMICEX_MAPPING *ExMapTable,
@@ -272,7 +272,7 @@ ExGetNextTokeNumber (
VOID
BuildPcdDxeDataBase (
VOID
-)
+ )
{
PEI_PCD_DATABASE *PeiDatabase;
EFI_HOB_GUID_TYPE *GuidHob;
@@ -312,7 +312,7 @@ BuildPcdDxeDataBase (
//
if (PCD_TOTAL_TOKEN_NUMBER != 0) {
- mCallbackFnTable = AllocateZeroPool (PCD_TOTAL_TOKEN_NUMBER);
+ mCallbackFnTable = AllocateZeroPool (PCD_TOTAL_TOKEN_NUMBER * sizeof (LIST_ENTRY));
}
for (Idx = 0; Idx < PCD_TOTAL_TOKEN_NUMBER; Idx++) {
@@ -457,7 +457,7 @@ InvokeCallbackOnSet (
EFI_STATUS
SetWorker (
- PCD_TOKEN_NUMBER TokenNumber,
+ UINTN TokenNumber,
VOID *Data,
UINTN Size,
BOOLEAN PtrType
@@ -592,14 +592,14 @@ ExGetWorker (
EFI_STATUS
ExSetWorker (
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN CONST EFI_GUID *Guid,
VOID *Data,
UINTN SetSize,
BOOLEAN PtrType
)
{
- PCD_TOKEN_NUMBER TokenNumber;
+ UINTN TokenNumber;
TokenNumber = GetExPcdTokenNumber (Guid, ExTokenNumber);
@@ -669,10 +669,10 @@ SetHiiVariable (
-PCD_TOKEN_NUMBER
+UINTN
GetExPcdTokenNumber (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
{
UINT32 i;
diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.h b/EdkModulePkg/Universal/PCD/Dxe/Service.h
index af9fc420a3..2784d28891 100644
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.h
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.h
@@ -46,7 +46,7 @@ typedef struct {
EFI_STATUS
SetWorker (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN VOID *Data,
IN UINTN Size,
IN BOOLEAN PtrType
@@ -55,7 +55,7 @@ SetWorker (
EFI_STATUS
ExSetWorker (
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN CONST EFI_GUID *Guid,
VOID *Data,
UINTN Size,
@@ -66,7 +66,7 @@ ExSetWorker (
VOID *
GetWorker (
- PCD_TOKEN_NUMBER TokenNumber,
+ UINTN TokenNumber,
UINTN GetSize
)
;
@@ -74,7 +74,7 @@ GetWorker (
VOID *
ExGetWorker (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN UINTN GetSize
)
;
@@ -98,14 +98,14 @@ GetHiiVariable (
EFI_STATUS
DxeRegisterCallBackWorker (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN CONST EFI_GUID *Guid, OPTIONAL
IN PCD_PROTOCOL_CALLBACK CallBackFunction
);
EFI_STATUS
DxeUnRegisterCallBackWorker (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN CONST EFI_GUID *Guid, OPTIONAL
IN PCD_PROTOCOL_CALLBACK CallBackFunction
);
@@ -116,10 +116,10 @@ BuildPcdDxeDataBase (
);
-PCD_TOKEN_NUMBER
+UINTN
GetExPcdTokenNumber (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
;
//
@@ -128,7 +128,7 @@ GetExPcdTokenNumber (
VOID
EFIAPI
DxePcdSetSku (
- IN SKU_ID SkuId
+ IN UINTN SkuId
)
;
@@ -136,7 +136,7 @@ DxePcdSetSku (
UINT8
EFIAPI
DxePcdGet8 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -144,7 +144,7 @@ DxePcdGet8 (
UINT16
EFIAPI
DxePcdGet16 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -152,7 +152,7 @@ DxePcdGet16 (
UINT32
EFIAPI
DxePcdGet32 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -160,7 +160,7 @@ DxePcdGet32 (
UINT64
EFIAPI
DxePcdGet64 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -168,7 +168,7 @@ DxePcdGet64 (
VOID *
EFIAPI
DxePcdGetPtr (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -176,7 +176,7 @@ DxePcdGetPtr (
BOOLEAN
EFIAPI
DxePcdGetBool (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -184,7 +184,7 @@ DxePcdGetBool (
UINTN
EFIAPI
DxePcdGetSize (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -193,7 +193,7 @@ UINT8
EFIAPI
DxePcdGet8Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -202,7 +202,7 @@ UINT16
EFIAPI
DxePcdGet16Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -211,7 +211,7 @@ UINT32
EFIAPI
DxePcdGet32Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -221,7 +221,7 @@ UINT64
EFIAPI
DxePcdGet64Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -231,7 +231,7 @@ VOID *
EFIAPI
DxePcdGetPtrEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -240,7 +240,7 @@ BOOLEAN
EFIAPI
DxePcdGetBoolEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -249,7 +249,7 @@ UINTN
EFIAPI
DxePcdGetSizeEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -257,7 +257,7 @@ DxePcdGetSizeEx (
EFI_STATUS
EFIAPI
DxePcdSet8 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
)
;
@@ -266,7 +266,7 @@ DxePcdSet8 (
EFI_STATUS
EFIAPI
DxePcdSet16 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
)
;
@@ -275,7 +275,7 @@ DxePcdSet16 (
EFI_STATUS
EFIAPI
DxePcdSet32 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
)
;
@@ -284,7 +284,7 @@ DxePcdSet32 (
EFI_STATUS
EFIAPI
DxePcdSet64 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
)
;
@@ -293,7 +293,7 @@ DxePcdSet64 (
EFI_STATUS
EFIAPI
DxePcdSetPtr (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
)
@@ -303,7 +303,7 @@ DxePcdSetPtr (
EFI_STATUS
EFIAPI
DxePcdSetBool (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
)
;
@@ -313,7 +313,7 @@ EFI_STATUS
EFIAPI
DxePcdSet8Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
)
;
@@ -323,7 +323,7 @@ EFI_STATUS
EFIAPI
DxePcdSet16Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
)
;
@@ -333,7 +333,7 @@ EFI_STATUS
EFIAPI
DxePcdSet32Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
)
;
@@ -343,7 +343,7 @@ EFI_STATUS
EFIAPI
DxePcdSet64Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
)
;
@@ -353,7 +353,7 @@ EFI_STATUS
EFIAPI
DxePcdSetPtrEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
)
@@ -364,7 +364,7 @@ EFI_STATUS
EFIAPI
DxePcdSetBoolEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
)
;
@@ -374,7 +374,7 @@ DxePcdSetBoolEx (
EFI_STATUS
EFIAPI
DxeRegisterCallBackOnSet (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN CONST EFI_GUID *Guid, OPTIONAL
IN PCD_PROTOCOL_CALLBACK CallBackFunction
)
@@ -384,7 +384,7 @@ DxeRegisterCallBackOnSet (
EFI_STATUS
EFIAPI
DxeUnRegisterCallBackOnSet (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN CONST EFI_GUID *Guid, OPTIONAL
IN PCD_PROTOCOL_CALLBACK CallBackFunction
)
@@ -395,14 +395,14 @@ EFI_STATUS
EFIAPI
DxePcdGetNextToken (
IN CONST EFI_GUID *Guid, OPTIONAL
- IN OUT PCD_TOKEN_NUMBER *TokenNumber
+ IN OUT UINTN *TokenNumber
)
;
-PCD_TOKEN_NUMBER
+UINTN
ExGetNextTokeNumber (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN EFI_GUID *GuidTable,
IN UINTN SizeOfGuidTable,
IN DYNAMICEX_MAPPING *ExMapTable,
diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.c b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
index 70b229e3a9..52390e404c 100644
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
@@ -86,11 +86,11 @@ PcdPeimInit (
VOID
EFIAPI
PeiPcdSetSku (
- IN SKU_ID SkuId
+ IN UINTN SkuId
)
{
- GetPcdDatabase()->Init.SystemSkuId = SkuId;
+ GetPcdDatabase()->Init.SystemSkuId = (SKU_ID) SkuId;
return;
}
@@ -100,7 +100,7 @@ PeiPcdSetSku (
UINT8
EFIAPI
PeiPcdGet8 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return *((UINT8 *) GetWorker (TokenNumber, sizeof (UINT8)));
@@ -111,7 +111,7 @@ PeiPcdGet8 (
UINT16
EFIAPI
PeiPcdGet16 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return ReadUnaligned16 (GetWorker (TokenNumber, sizeof (UINT16)));
@@ -122,7 +122,7 @@ PeiPcdGet16 (
UINT32
EFIAPI
PeiPcdGet32 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return ReadUnaligned32 (GetWorker (TokenNumber, sizeof (UINT32)));
@@ -133,7 +133,7 @@ PeiPcdGet32 (
UINT64
EFIAPI
PeiPcdGet64 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return ReadUnaligned64 (GetWorker (TokenNumber, sizeof (UINT64)));
@@ -144,7 +144,7 @@ PeiPcdGet64 (
VOID *
EFIAPI
PeiPcdGetPtr (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return GetWorker (TokenNumber, 0);
@@ -155,7 +155,7 @@ PeiPcdGetPtr (
BOOLEAN
EFIAPI
PeiPcdGetBool (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return *((BOOLEAN *) GetWorker (TokenNumber, sizeof (BOOLEAN)));
@@ -166,7 +166,7 @@ PeiPcdGetBool (
UINTN
EFIAPI
PeiPcdGetSize (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);
@@ -180,7 +180,7 @@ UINT8
EFIAPI
PeiPcdGet8Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
{
return *((UINT8 *) ExGetWorker (Guid, ExTokenNumber, sizeof (UINT8)));
@@ -192,7 +192,7 @@ UINT16
EFIAPI
PeiPcdGet16Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
{
return ReadUnaligned16 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT16)));
@@ -204,7 +204,7 @@ UINT32
EFIAPI
PeiPcdGet32Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
{
return ReadUnaligned32 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT32)));
@@ -216,7 +216,7 @@ UINT64
EFIAPI
PeiPcdGet64Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
{
return ReadUnaligned64 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT64)));
@@ -228,7 +228,7 @@ VOID *
EFIAPI
PeiPcdGetPtrEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
{
return ExGetWorker (Guid, ExTokenNumber, 0);
@@ -240,7 +240,7 @@ BOOLEAN
EFIAPI
PeiPcdGetBoolEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
{
return *((BOOLEAN *) ExGetWorker (Guid, ExTokenNumber, sizeof (BOOLEAN)));
@@ -252,7 +252,7 @@ UINTN
EFIAPI
PeiPcdGetSizeEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
{
return PeiPcdGetSize (GetExPcdTokenNumber (Guid, ExTokenNumber));
@@ -263,7 +263,7 @@ PeiPcdGetSizeEx (
EFI_STATUS
EFIAPI
PeiPcdSet8 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
)
{
@@ -275,7 +275,7 @@ PeiPcdSet8 (
EFI_STATUS
EFIAPI
PeiPcdSet16 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
)
{
@@ -287,7 +287,7 @@ PeiPcdSet16 (
EFI_STATUS
EFIAPI
PeiPcdSet32 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
)
{
@@ -299,7 +299,7 @@ PeiPcdSet32 (
EFI_STATUS
EFIAPI
PeiPcdSet64 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
)
{
@@ -310,7 +310,7 @@ PeiPcdSet64 (
EFI_STATUS
EFIAPI
PeiPcdSetPtr (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
)
@@ -323,7 +323,7 @@ PeiPcdSetPtr (
EFI_STATUS
EFIAPI
PeiPcdSetBool (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
)
{
@@ -336,7 +336,7 @@ EFI_STATUS
EFIAPI
PeiPcdSet8Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN UINT8 Value
)
{
@@ -355,7 +355,7 @@ EFI_STATUS
EFIAPI
PeiPcdSet16Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN UINT16 Value
)
{
@@ -374,7 +374,7 @@ EFI_STATUS
EFIAPI
PeiPcdSet32Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN UINT32 Value
)
{
@@ -393,7 +393,7 @@ EFI_STATUS
EFIAPI
PeiPcdSet64Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN UINT64 Value
)
{
@@ -412,7 +412,7 @@ EFI_STATUS
EFIAPI
PeiPcdSetPtrEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Value
)
@@ -432,7 +432,7 @@ EFI_STATUS
EFIAPI
PeiPcdSetBoolEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN BOOLEAN Value
)
{
@@ -451,7 +451,7 @@ PeiPcdSetBoolEx (
EFI_STATUS
EFIAPI
PeiRegisterCallBackOnSet (
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN CONST EFI_GUID *Guid, OPTIONAL
IN PCD_PPI_CALLBACK CallBackFunction
)
@@ -466,7 +466,7 @@ PeiRegisterCallBackOnSet (
EFI_STATUS
EFIAPI
PcdUnRegisterCallBackOnSet (
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN CONST EFI_GUID *Guid, OPTIONAL
IN PCD_PPI_CALLBACK CallBackFunction
)
@@ -482,7 +482,7 @@ EFI_STATUS
EFIAPI
PeiPcdGetNextToken (
IN CONST EFI_GUID *Guid, OPTIONAL
- IN OUT PCD_TOKEN_NUMBER *TokenNumber
+ IN OUT UINTN *TokenNumber
)
{
UINTN GuidTableIdx;
diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.c b/EdkModulePkg/Universal/PCD/Pei/Service.c
index 62e2f9c114..247ebadcd7 100644
--- a/EdkModulePkg/Universal/PCD/Pei/Service.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.c
@@ -30,7 +30,7 @@ Module Name: Service.c
--*/
EFI_STATUS
PeiRegisterCallBackWorker (
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN CONST EFI_GUID *Guid, OPTIONAL
IN PCD_PPI_CALLBACK CallBackFunction,
IN BOOLEAN Register
@@ -41,7 +41,7 @@ PeiRegisterCallBackWorker (
PCD_PPI_CALLBACK Compare;
PCD_PPI_CALLBACK Assign;
UINT32 LocalTokenNumber;
- PCD_TOKEN_NUMBER TokenNumber;
+ UINTN TokenNumber;
UINTN Idx;
if (Guid == NULL) {
@@ -271,7 +271,7 @@ InvokeCallbackOnSet (
EFI_STATUS
SetWorker (
- PCD_TOKEN_NUMBER TokenNumber,
+ UINTN TokenNumber,
VOID *Data,
UINTN Size,
BOOLEAN PtrType
@@ -367,14 +367,14 @@ SetWorker (
EFI_STATUS
ExSetWorker (
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN CONST EFI_GUID *Guid,
VOID *Data,
UINTN Size,
BOOLEAN PtrType
)
{
- PCD_TOKEN_NUMBER TokenNumber;
+ UINTN TokenNumber;
TokenNumber = GetExPcdTokenNumber (Guid, ExTokenNumber);
@@ -392,7 +392,7 @@ ExSetWorker (
VOID *
ExGetWorker (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN UINTN GetSize
)
{
@@ -404,7 +404,7 @@ ExGetWorker (
VOID *
GetWorker (
- PCD_TOKEN_NUMBER TokenNumber,
+ UINTN TokenNumber,
UINTN GetSize
)
{
@@ -481,7 +481,7 @@ GetWorker (
}
-PCD_TOKEN_NUMBER
+UINTN
GetExPcdTokenNumber (
IN CONST EFI_GUID *Guid,
IN UINT32 ExTokenNumber
diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.h b/EdkModulePkg/Universal/PCD/Pei/Service.h
index df774c9d39..e62d0307a7 100644
--- a/EdkModulePkg/Universal/PCD/Pei/Service.h
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.h
@@ -42,7 +42,7 @@ GetPcdDatabase (
EFI_STATUS
SetWorker (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN VOID *Data,
IN UINTN Size,
IN BOOLEAN PtrType
@@ -51,7 +51,7 @@ SetWorker (
EFI_STATUS
ExSetWorker (
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN CONST EFI_GUID *Guid,
IN VOID *Data,
IN UINTN Size,
@@ -61,7 +61,7 @@ ExSetWorker (
VOID *
GetWorker (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN GetSize
)
;
@@ -69,7 +69,7 @@ GetWorker (
VOID *
ExGetWorker (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber,
+ IN UINTN ExTokenNumber,
IN UINTN GetSize
)
;
@@ -81,10 +81,10 @@ typedef struct {
} EX_PCD_ENTRY_ATTRIBUTE;
-PCD_TOKEN_NUMBER
+UINTN
GetExPcdTokenNumber (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER ExTokenNumber
+ IN UINTN ExTokenNumber
)
;
@@ -93,7 +93,7 @@ GetExPcdTokenNumber (
EFI_STATUS
PeiRegisterCallBackWorker (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN CONST GUID *Guid, OPTIONAL
IN PCD_PPI_CALLBACK CallBackFunction,
IN BOOLEAN Register
@@ -115,7 +115,7 @@ BuildPcdDatabase (
VOID
EFIAPI
PeiPcdSetSku (
- IN SKU_ID SkuId
+ IN UINTN SkuId
)
;
@@ -123,7 +123,7 @@ PeiPcdSetSku (
UINT8
EFIAPI
PeiPcdGet8 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -131,7 +131,7 @@ PeiPcdGet8 (
UINT16
EFIAPI
PeiPcdGet16 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -139,7 +139,7 @@ PeiPcdGet16 (
UINT32
EFIAPI
PeiPcdGet32 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -147,7 +147,7 @@ PeiPcdGet32 (
UINT64
EFIAPI
PeiPcdGet64 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -155,7 +155,7 @@ PeiPcdGet64 (
VOID *
EFIAPI
PeiPcdGetPtr (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -163,7 +163,7 @@ PeiPcdGetPtr (
BOOLEAN
EFIAPI
PeiPcdGetBool (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -171,7 +171,7 @@ PeiPcdGetBool (
UINTN
EFIAPI
PeiPcdGetSize (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -180,7 +180,7 @@ UINT8
EFIAPI
PeiPcdGet8Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -189,7 +189,7 @@ UINT16
EFIAPI
PeiPcdGet16Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -197,7 +197,7 @@ UINT32
EFIAPI
PeiPcdGet32Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -206,7 +206,7 @@ UINT64
EFIAPI
PeiPcdGet64Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -215,7 +215,7 @@ VOID *
EFIAPI
PeiPcdGetPtrEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -224,7 +224,7 @@ BOOLEAN
EFIAPI
PeiPcdGetBoolEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -233,7 +233,7 @@ UINTN
EFIAPI
PeiPcdGetSizeEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
;
@@ -241,7 +241,7 @@ PeiPcdGetSizeEx (
EFI_STATUS
EFIAPI
PeiPcdSet8 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
)
;
@@ -250,7 +250,7 @@ PeiPcdSet8 (
EFI_STATUS
EFIAPI
PeiPcdSet16 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
)
;
@@ -259,7 +259,7 @@ PeiPcdSet16 (
EFI_STATUS
EFIAPI
PeiPcdSet32 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
)
;
@@ -268,7 +268,7 @@ PeiPcdSet32 (
EFI_STATUS
EFIAPI
PeiPcdSet64 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
)
;
@@ -276,7 +276,7 @@ PeiPcdSet64 (
EFI_STATUS
EFIAPI
PeiPcdSetPtr (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
)
@@ -286,7 +286,7 @@ PeiPcdSetPtr (
EFI_STATUS
EFIAPI
PeiPcdSetBool (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
)
;
@@ -296,7 +296,7 @@ EFI_STATUS
EFIAPI
PeiPcdSet8Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
)
;
@@ -305,7 +305,7 @@ EFI_STATUS
EFIAPI
PeiPcdSet16Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
)
;
@@ -315,7 +315,7 @@ EFI_STATUS
EFIAPI
PeiPcdSet32Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
)
;
@@ -325,7 +325,7 @@ EFI_STATUS
EFIAPI
PeiPcdSet64Ex (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
)
;
@@ -335,7 +335,7 @@ EFI_STATUS
EFIAPI
PeiPcdSetPtrEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
)
@@ -346,7 +346,7 @@ EFI_STATUS
EFIAPI
PeiPcdSetBoolEx (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
)
;
@@ -356,7 +356,7 @@ PeiPcdSetBoolEx (
EFI_STATUS
EFIAPI
PeiRegisterCallBackOnSet (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN CONST EFI_GUID *Guid, OPTIONAL
IN PCD_PPI_CALLBACK CallBackFunction
)
@@ -366,7 +366,7 @@ PeiRegisterCallBackOnSet (
EFI_STATUS
EFIAPI
PcdUnRegisterCallBackOnSet (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN CONST EFI_GUID *Guid, OPTIONAL
IN PCD_PPI_CALLBACK CallBackFunction
)
@@ -377,7 +377,7 @@ EFI_STATUS
EFIAPI
PeiPcdGetNextToken (
IN CONST EFI_GUID *Guid, OPTIONAL
- IN OUT PCD_TOKEN_NUMBER *TokenNumber
+ IN OUT UINTN *TokenNumber
)
;
diff --git a/MdePkg/Include/Library/PcdLib.h b/MdePkg/Include/Library/PcdLib.h
index 6d543129cd..03493e210a 100644
--- a/MdePkg/Include/Library/PcdLib.h
+++ b/MdePkg/Include/Library/PcdLib.h
@@ -18,8 +18,7 @@ Module Name: PcdLib.h
#ifndef __PCD_LIB_H__
#define __PCD_LIB_H__
-#include <Common/Pcd.h>
-
+#define PCD_INVALID_TOKEN_NUMBER ((UINTN) -1)
#define PcdToken(TokenName) _PCD_TOKEN_##TokenName
@@ -93,7 +92,7 @@ Module Name: PcdLib.h
#define PcdSet16(TokenName, Value) LibPcdSet16 (_PCD_TOKEN_##TokenName, Value)
#define PcdSet32(TokenName, Value) LibPcdSet32 (_PCD_TOKEN_##TokenName, Value)
#define PcdSet64(TokenName, Value) LibPcdSet64 (_PCD_TOKEN_##TokenName, Value)
-#define PcdSetPtr(TokenName, Value) LibPcdSetPtr (_PCD_TOKEN_##TokenName, Value)
+#define PcdSetPtr(TokenName, SizeOfBuffer, Buffer) LibPcdSetPtr (_PCD_TOKEN_##TokenName, SizeOfBuffer, Buffer)
#define PcdSetBool(TokenName, Value) LibPcdSetBool(_PCD_TOKEN_##TokenName, Value)
@@ -104,7 +103,7 @@ Module Name: PcdLib.h
#define PcdSetEx16(Guid, TokenName, Value) LibPcdSetEx16 (Guid, _PCD_TOKEN_##TokenName, Value)
#define PcdSetEx32(Guid, TokenName, Value) LibPcdSetEx32 (Guid, _PCD_TOKEN_##TokenName, Value)
#define PcdSetEx64(Guid, TokenName, Value) LibPcdSetEx64 (Guid, _PCD_TOKEN_##TokenName, Value)
-#define PcdSetExPtr(Guid, TokenName, Value) LibPcdSetExPtr (Guid, _PCD_TOKEN_##TokenName, Value)
+#define PcdSetExPtr(Guid, TokenName, SizeOfBuffer, Buffer) LibPcdSetExPtr (Guid, _PCD_TOKEN_##TokenName, SizeOfBuffer, Buffer)
#define PcdSetExBool(Guid, TokenName, Value) LibPcdSetExBool(Guid, _PCD_TOKEN_##TokenName, Value)
@@ -117,10 +116,10 @@ Module Name: PcdLib.h
@retval SKU_ID Return the SKU ID that just be set.
**/
-SKU_ID
+UINTN
EFIAPI
LibPcdSetSku (
- IN SKU_ID SkuId
+ IN UINTN SkuId
);
@@ -135,7 +134,7 @@ LibPcdSetSku (
UINT8
EFIAPI
LibPcdGet8 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
@@ -150,7 +149,7 @@ LibPcdGet8 (
UINT16
EFIAPI
LibPcdGet16 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
@@ -165,7 +164,7 @@ LibPcdGet16 (
UINT32
EFIAPI
LibPcdGet32 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
@@ -180,7 +179,7 @@ LibPcdGet32 (
UINT64
EFIAPI
LibPcdGet64 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
@@ -195,7 +194,7 @@ LibPcdGet64 (
VOID *
EFIAPI
LibPcdGetPtr (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
@@ -210,7 +209,7 @@ LibPcdGetPtr (
BOOLEAN
EFIAPI
LibPcdGetBool (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
@@ -225,7 +224,7 @@ LibPcdGetBool (
UINTN
EFIAPI
LibPcdGetSize (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
@@ -244,7 +243,7 @@ UINT8
EFIAPI
LibPcdGetEx8 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
@@ -263,7 +262,7 @@ UINT16
EFIAPI
LibPcdGetEx16 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
@@ -282,7 +281,7 @@ UINT32
EFIAPI
LibPcdGetEx32 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
@@ -301,7 +300,7 @@ UINT64
EFIAPI
LibPcdGetEx64 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
@@ -320,7 +319,7 @@ VOID *
EFIAPI
LibPcdGetExPtr (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
@@ -339,7 +338,7 @@ BOOLEAN
EFIAPI
LibPcdGetExBool (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
@@ -358,7 +357,7 @@ UINTN
EFIAPI
LibPcdGetExSize (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
@@ -375,7 +374,7 @@ LibPcdGetExSize (
UINT8
EFIAPI
LibPcdSet8 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
);
@@ -393,7 +392,7 @@ LibPcdSet8 (
UINT16
EFIAPI
LibPcdSet16 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
);
@@ -411,7 +410,7 @@ LibPcdSet16 (
UINT32
EFIAPI
LibPcdSet32 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
);
@@ -429,7 +428,7 @@ LibPcdSet32 (
UINT64
EFIAPI
LibPcdSet64 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
);
@@ -448,7 +447,7 @@ LibPcdSet64 (
VOID*
EFIAPI
LibPcdSetPtr (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Value
);
@@ -467,7 +466,7 @@ LibPcdSetPtr (
BOOLEAN
EFIAPI
LibPcdSetBool (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
);
@@ -489,7 +488,7 @@ UINT8
EFIAPI
LibPcdSetEx8 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
);
@@ -511,7 +510,7 @@ UINT16
EFIAPI
LibPcdSetEx16 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
);
@@ -533,7 +532,7 @@ UINT32
EFIAPI
LibPcdSetEx32 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
);
@@ -555,7 +554,7 @@ UINT64
EFIAPI
LibPcdSetEx64 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
);
@@ -578,7 +577,7 @@ VOID *
EFIAPI
LibPcdSetExPtr (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Value
);
@@ -601,7 +600,7 @@ BOOLEAN
EFIAPI
LibPcdSetExBool (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
);
@@ -624,7 +623,7 @@ typedef
VOID
(EFIAPI *PCD_CALLBACK) (
IN CONST GUID *CallBackGuid, OPTIONAL
- IN PCD_TOKEN_NUMBER CallBackToken,
+ IN UINTN CallBackToken,
IN OUT VOID *TokenData,
IN UINTN TokenDataSize
);
@@ -650,7 +649,7 @@ VOID
EFIAPI
LibPcdCallbackOnSet (
IN CONST GUID *Guid, OPTIONAL
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN PCD_CALLBACK NotificationFunction
);
@@ -669,7 +668,7 @@ VOID
EFIAPI
LibPcdCancelCallback (
IN CONST GUID *Guid, OPTIONAL
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN PCD_CALLBACK NotificationFunction
);
@@ -687,14 +686,14 @@ LibPcdCancelCallback (
@param[in] The previous PCD token number. If 0, then retrieves the first PCD
token number.
- @retval PCD_TOKEN_NUMBER The next valid token number.
+ @retval UINTN The next valid token number.
**/
-PCD_TOKEN_NUMBER
+UINTN
EFIAPI
LibPcdGetNextToken (
IN CONST GUID *Guid, OPTIONAL
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
#endif
diff --git a/MdePkg/Include/Ppi/Pcd.h b/MdePkg/Include/Ppi/Pcd.h
index 1625b8739e..2841f54425 100644
--- a/MdePkg/Include/Ppi/Pcd.h
+++ b/MdePkg/Include/Ppi/Pcd.h
@@ -17,142 +17,142 @@
#ifndef __PCD_H__
#define __PCD_H__
-#include <Common/Pcd.h>
-
extern EFI_GUID gPcdPpiGuid;
#define PCD_PPI_GUID \
{ 0x632df884, 0x8023, 0x4872, { 0xb6, 0x70, 0xb7, 0x4a, 0x30, 0x19, 0x16, 0xe9 } }
+#define PCD_INVALID_TOKEN_NUMBER ((UINTN) -1)
+
typedef
VOID
(EFIAPI *PCD_PPI_SET_SKU) (
- IN SKU_ID SkuId
+ IN UINTN SkuId
);
typedef
UINT8
(EFIAPI *PCD_PPI_GET8) (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINT16
(EFIAPI *PCD_PPI_GET16) (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINT32
(EFIAPI *PCD_PPI_GET32) (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINT64
(EFIAPI *PCD_PPI_GET64) (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
VOID *
(EFIAPI *PCD_PPI_GET_POINTER) (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
BOOLEAN
(EFIAPI *PCD_PPI_GET_BOOLEAN) (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINTN
(EFIAPI *PCD_PPI_GET_SIZE) (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINT8
(EFIAPI *PCD_PPI_GET_EX_8) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINT16
(EFIAPI *PCD_PPI_GET_EX_16) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINT32
(EFIAPI *PCD_PPI_GET_EX_32) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINT64
(EFIAPI *PCD_PPI_GET_EX_64) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
VOID *
(EFIAPI *PCD_PPI_GET_EX_POINTER) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
BOOLEAN
(EFIAPI *PCD_PPI_GET_EX_BOOLEAN) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINTN
(EFIAPI *PCD_PPI_GET_EX_SIZE) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
EFI_STATUS
(EFIAPI *PCD_PPI_SET8) (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
);
typedef
EFI_STATUS
(EFIAPI *PCD_PPI_SET16) (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
);
typedef
EFI_STATUS
(EFIAPI *PCD_PPI_SET32) (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
);
typedef
EFI_STATUS
(EFIAPI *PCD_PPI_SET64) (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
);
typedef
EFI_STATUS
(EFIAPI *PCD_PPI_SET_POINTER) (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
);
@@ -160,7 +160,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *PCD_PPI_SET_BOOLEAN) (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
);
@@ -168,7 +168,7 @@ typedef
EFI_STATUS
(EFIAPI *PCD_PPI_SET_EX_8) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
);
@@ -176,7 +176,7 @@ typedef
EFI_STATUS
(EFIAPI *PCD_PPI_SET_EX_16) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
);
@@ -184,7 +184,7 @@ typedef
EFI_STATUS
(EFIAPI *PCD_PPI_SET_EX_32) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
);
@@ -192,7 +192,7 @@ typedef
EFI_STATUS
(EFIAPI *PCD_PPI_SET_EX_64) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
);
@@ -200,7 +200,7 @@ typedef
EFI_STATUS
(EFIAPI *PCD_PPI_SET_EX_POINTER) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
);
@@ -209,7 +209,7 @@ typedef
EFI_STATUS
(EFIAPI *PCD_PPI_SET_EX_BOOLEAN) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
);
@@ -228,7 +228,7 @@ typedef
VOID
(EFIAPI *PCD_PPI_CALLBACK) (
IN CONST EFI_GUID *CallBackGuid, OPTIONAL
- IN PCD_TOKEN_NUMBER CallBackToken,
+ IN UINTN CallBackToken,
IN OUT VOID *TokenData,
IN UINTN TokenDataSize
);
@@ -236,7 +236,7 @@ VOID
typedef
EFI_STATUS
(EFIAPI *PCD_PPI_CALLBACK_ONSET) (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN CONST EFI_GUID *Guid, OPTIONAL
IN PCD_PPI_CALLBACK CallBackFunction
);
@@ -244,7 +244,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *PCD_PPI_CANCEL_CALLBACK) (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN CONST EFI_GUID *Guid, OPTIONAL
IN PCD_PPI_CALLBACK CallBackFunction
);
@@ -253,7 +253,7 @@ typedef
EFI_STATUS
(EFIAPI *PCD_PPI_GET_NEXT_TOKEN) (
IN CONST EFI_GUID *Guid, OPTIONAL
- IN OUT PCD_TOKEN_NUMBER *TokenNumber
+ IN OUT UINTN *TokenNumber
);
typedef struct {
diff --git a/MdePkg/Include/Protocol/Pcd.h b/MdePkg/Include/Protocol/Pcd.h
index 3adac6d4ab..323c16ccf1 100644
--- a/MdePkg/Include/Protocol/Pcd.h
+++ b/MdePkg/Include/Protocol/Pcd.h
@@ -17,142 +17,142 @@
#ifndef __PCD_H__
#define __PCD_H__
-#include <Common/Pcd.h>
-
extern EFI_GUID gPcdProtocolGuid;
#define PCD_PROTOCOL_GUID \
{ 0x11b34006, 0xd85b, 0x4d0a, { 0xa2, 0x90, 0xd5, 0xa5, 0x71, 0x31, 0xe, 0xf7 } }
+#define PCD_INVALID_TOKEN_NUMBER ((UINTN) -1)
+
typedef
VOID
(EFIAPI *PCD_PROTOCOL_SET_SKU) (
- IN SKU_ID SkuId
+ IN UINTN SkuId
);
typedef
UINT8
(EFIAPI *PCD_PROTOCOL_GET8) (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINT16
(EFIAPI *PCD_PROTOCOL_GET16) (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINT32
(EFIAPI *PCD_PROTOCOL_GET32) (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINT64
(EFIAPI *PCD_PROTOCOL_GET64) (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
VOID *
(EFIAPI *PCD_PROTOCOL_GET_POINTER) (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
BOOLEAN
(EFIAPI *PCD_PROTOCOL_GET_BOOLEAN) (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINTN
(EFIAPI *PCD_PROTOCOL_GET_SIZE) (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINT8
(EFIAPI *PCD_PROTOCOL_GET_EX_8) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINT16
(EFIAPI *PCD_PROTOCOL_GET_EX_16) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINT32
(EFIAPI *PCD_PROTOCOL_GET_EX_32) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINT64
(EFIAPI *PCD_PROTOCOL_GET_EX_64) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
VOID *
(EFIAPI *PCD_PROTOCOL_GET_EX_POINTER) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
BOOLEAN
(EFIAPI *PCD_PROTOCOL_GET_EX_BOOLEAN) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
UINTN
(EFIAPI *PCD_PROTOCOL_GET_EX_SIZE) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
);
typedef
EFI_STATUS
(EFIAPI *PCD_PROTOCOL_SET8) (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
);
typedef
EFI_STATUS
(EFIAPI *PCD_PROTOCOL_SET16) (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
);
typedef
EFI_STATUS
(EFIAPI *PCD_PROTOCOL_SET32) (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
);
typedef
EFI_STATUS
(EFIAPI *PCD_PROTOCOL_SET64) (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
);
typedef
EFI_STATUS
(EFIAPI *PCD_PROTOCOL_SET_POINTER) (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
);
@@ -160,7 +160,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *PCD_PROTOCOL_SET_BOOLEAN) (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
);
@@ -168,7 +168,7 @@ typedef
EFI_STATUS
(EFIAPI *PCD_PROTOCOL_SET_EX_8) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
);
@@ -176,7 +176,7 @@ typedef
EFI_STATUS
(EFIAPI *PCD_PROTOCOL_SET_EX_16) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
);
@@ -184,7 +184,7 @@ typedef
EFI_STATUS
(EFIAPI *PCD_PROTOCOL_SET_EX_32) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
);
@@ -192,7 +192,7 @@ typedef
EFI_STATUS
(EFIAPI *PCD_PROTOCOL_SET_EX_64) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
);
@@ -200,7 +200,7 @@ typedef
EFI_STATUS
(EFIAPI *PCD_PROTOCOL_SET_EX_POINTER) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
);
@@ -209,7 +209,7 @@ typedef
EFI_STATUS
(EFIAPI *PCD_PROTOCOL_SET_EX_BOOLEAN) (
IN CONST EFI_GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
);
@@ -228,7 +228,7 @@ typedef
VOID
(EFIAPI *PCD_PROTOCOL_CALLBACK) (
IN CONST EFI_GUID *CallBackGuid, OPTIONAL
- IN PCD_TOKEN_NUMBER CallBackToken,
+ IN UINTN CallBackToken,
IN OUT VOID *TokenData,
IN UINTN TokenDataSize
);
@@ -236,7 +236,7 @@ VOID
typedef
EFI_STATUS
(EFIAPI *PCD_PROTOCOL_CALLBACK_ONSET) (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN CONST EFI_GUID *Guid, OPTIONAL
IN PCD_PROTOCOL_CALLBACK CallBackFunction
);
@@ -244,7 +244,7 @@ EFI_STATUS
typedef
EFI_STATUS
(EFIAPI *PCD_PROTOCOL_CANCEL_CALLBACK) (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN CONST EFI_GUID *Guid, OPTIONAL
IN PCD_PROTOCOL_CALLBACK CallBackFunction
);
@@ -253,7 +253,7 @@ typedef
EFI_STATUS
(EFIAPI *PCD_PROTOCOL_GET_NEXT_TOKEN) (
IN CONST EFI_GUID *Guid, OPTIONAL
- IN OUT PCD_TOKEN_NUMBER *TokenNumber
+ IN OUT UINTN *TokenNumber
);
typedef struct {
diff --git a/MdePkg/Library/BasePcdLibNull/PcdLib.c b/MdePkg/Library/BasePcdLibNull/PcdLib.c
index a4e0183964..1dcb6fe0ba 100644
--- 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.
**/
-SKU_ID
+UINTN
EFIAPI
LibPcdSetSku (
- IN SKU_ID SkuId
+ IN UINTN SkuId
)
{
return SkuId;
@@ -47,7 +47,7 @@ LibPcdSetSku (
UINT8
EFIAPI
LibPcdGet8 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return 0;
@@ -66,7 +66,7 @@ LibPcdGet8 (
UINT16
EFIAPI
LibPcdGet16 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return 0;
@@ -85,7 +85,7 @@ LibPcdGet16 (
UINT32
EFIAPI
LibPcdGet32 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return 0;
@@ -104,7 +104,7 @@ LibPcdGet32 (
UINT64
EFIAPI
LibPcdGet64 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return 0;
@@ -123,7 +123,7 @@ LibPcdGet64 (
VOID *
EFIAPI
LibPcdGetPtr (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return 0;
@@ -142,7 +142,7 @@ LibPcdGetPtr (
BOOLEAN
EFIAPI
LibPcdGetBool (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return 0;
@@ -161,7 +161,7 @@ LibPcdGetBool (
UINTN
EFIAPI
LibPcdGetSize (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return 0;
@@ -184,7 +184,7 @@ UINT8
EFIAPI
LibPcdGetEx8 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
ASSERT (Guid != NULL);
@@ -209,7 +209,7 @@ UINT16
EFIAPI
LibPcdGetEx16 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
ASSERT (Guid != NULL);
@@ -234,7 +234,7 @@ UINT32
EFIAPI
LibPcdGetEx32 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
ASSERT (Guid != NULL);
@@ -259,7 +259,7 @@ UINT64
EFIAPI
LibPcdGetEx64 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
ASSERT (Guid != NULL);
@@ -284,7 +284,7 @@ VOID *
EFIAPI
LibPcdGetExPtr (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
ASSERT (Guid != NULL);
@@ -309,7 +309,7 @@ BOOLEAN
EFIAPI
LibPcdGetExBool (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
ASSERT (Guid != NULL);
@@ -334,7 +334,7 @@ UINTN
EFIAPI
LibPcdGetExSize (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
ASSERT (Guid != NULL);
@@ -357,7 +357,7 @@ LibPcdGetExSize (
UINT8
EFIAPI
LibPcdSet8 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
)
{
@@ -379,7 +379,7 @@ LibPcdSet8 (
UINT16
EFIAPI
LibPcdSet16 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
)
{
@@ -401,7 +401,7 @@ LibPcdSet16 (
UINT32
EFIAPI
LibPcdSet32 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
)
{
@@ -423,7 +423,7 @@ LibPcdSet32 (
UINT64
EFIAPI
LibPcdSet64 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
)
{
@@ -446,7 +446,7 @@ LibPcdSet64 (
VOID *
EFIAPI
LibPcdSetPtr (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
)
@@ -471,7 +471,7 @@ LibPcdSetPtr (
BOOLEAN
EFIAPI
LibPcdSetBool (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
)
{
@@ -497,7 +497,7 @@ UINT8
EFIAPI
LibPcdSetEx8 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
)
{
@@ -525,7 +525,7 @@ UINT16
EFIAPI
LibPcdSetEx16 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
)
{
@@ -553,7 +553,7 @@ UINT32
EFIAPI
LibPcdSetEx32 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
)
{
@@ -581,7 +581,7 @@ UINT64
EFIAPI
LibPcdSetEx64 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
)
{
@@ -610,7 +610,7 @@ VOID *
EFIAPI
LibPcdSetExPtr (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
)
@@ -640,7 +640,7 @@ BOOLEAN
EFIAPI
LibPcdSetExBool (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
)
{
@@ -671,7 +671,7 @@ VOID
EFIAPI
LibPcdCallbackOnSet (
IN CONST GUID *Guid, OPTIONAL
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN PCD_CALLBACK NotificationFunction
)
{
@@ -695,7 +695,7 @@ VOID
EFIAPI
LibPcdCancelCallback (
IN CONST GUID *Guid, OPTIONAL
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN PCD_CALLBACK NotificationFunction
)
{
@@ -717,14 +717,14 @@ LibPcdCancelCallback (
@param[in] The previous PCD token number. If 0, then retrieves the first PCD
token number.
- @retval PCD_TOKEN_NUMBER The next valid token number.
+ @retval UINTN The next valid token number.
**/
-PCD_TOKEN_NUMBER
+UINTN
EFIAPI
LibPcdGetNextToken (
IN CONST GUID *Guid, OPTIONAL
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return 0;
diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.c b/MdePkg/Library/DxePcdLib/DxePcdLib.c
index f3818a6e7e..c20fad2302 100644
--- 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.
**/
-SKU_ID
+UINTN
EFIAPI
LibPcdSetSku (
- IN SKU_ID SkuId
+ IN UINTN SkuId
)
{
mPcd->SetSku (SkuId);
@@ -75,7 +75,7 @@ LibPcdSetSku (
UINT8
EFIAPI
LibPcdGet8 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return mPcd->Get8 (TokenNumber);
@@ -94,7 +94,7 @@ LibPcdGet8 (
UINT16
EFIAPI
LibPcdGet16 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return mPcd->Get16 (TokenNumber);
@@ -113,7 +113,7 @@ LibPcdGet16 (
UINT32
EFIAPI
LibPcdGet32 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return mPcd->Get32 (TokenNumber);
@@ -132,7 +132,7 @@ LibPcdGet32 (
UINT64
EFIAPI
LibPcdGet64 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return mPcd->Get64 (TokenNumber);
@@ -151,7 +151,7 @@ LibPcdGet64 (
VOID *
EFIAPI
LibPcdGetPtr (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return mPcd->GetPtr (TokenNumber);
@@ -170,7 +170,7 @@ LibPcdGetPtr (
BOOLEAN
EFIAPI
LibPcdGetBool (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return mPcd->GetBool (TokenNumber);
@@ -189,7 +189,7 @@ LibPcdGetBool (
UINTN
EFIAPI
LibPcdGetSize (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
return mPcd->GetSize (TokenNumber);
@@ -212,7 +212,7 @@ UINT8
EFIAPI
LibPcdGetEx8 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
ASSERT (Guid != NULL);
@@ -236,7 +236,7 @@ UINT16
EFIAPI
LibPcdGetEx16 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
ASSERT (Guid != NULL);
@@ -260,7 +260,7 @@ UINT32
EFIAPI
LibPcdGetEx32 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
ASSERT (Guid != NULL);
@@ -285,7 +285,7 @@ UINT64
EFIAPI
LibPcdGetEx64 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
ASSERT (Guid != NULL);
@@ -310,7 +310,7 @@ VOID *
EFIAPI
LibPcdGetExPtr (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
ASSERT (Guid != NULL);
@@ -335,7 +335,7 @@ BOOLEAN
EFIAPI
LibPcdGetExBool (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
ASSERT (Guid != NULL);
@@ -360,7 +360,7 @@ UINTN
EFIAPI
LibPcdGetExSize (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
ASSERT (Guid != NULL);
@@ -383,7 +383,7 @@ LibPcdGetExSize (
UINT8
EFIAPI
LibPcdSet8 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
)
{
@@ -411,7 +411,7 @@ LibPcdSet8 (
UINT16
EFIAPI
LibPcdSet16 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
)
{
@@ -439,7 +439,7 @@ LibPcdSet16 (
UINT32
EFIAPI
LibPcdSet32 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
)
{
@@ -466,7 +466,7 @@ LibPcdSet32 (
UINT64
EFIAPI
LibPcdSet64 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
)
{
@@ -495,7 +495,7 @@ LibPcdSet64 (
VOID *
EFIAPI
LibPcdSetPtr (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
)
@@ -526,7 +526,7 @@ LibPcdSetPtr (
BOOLEAN
EFIAPI
LibPcdSetBool (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
)
{
@@ -558,7 +558,7 @@ UINT8
EFIAPI
LibPcdSetEx8 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
)
{
@@ -592,7 +592,7 @@ UINT16
EFIAPI
LibPcdSetEx16 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
)
{
@@ -626,7 +626,7 @@ UINT32
EFIAPI
LibPcdSetEx32 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
)
{
@@ -660,7 +660,7 @@ UINT64
EFIAPI
LibPcdSetEx64 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
)
{
@@ -695,7 +695,7 @@ VOID *
EFIAPI
LibPcdSetExPtr (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
)
@@ -731,7 +731,7 @@ BOOLEAN
EFIAPI
LibPcdSetExBool (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
)
{
@@ -768,7 +768,7 @@ VOID
EFIAPI
LibPcdCallbackOnSet (
IN CONST GUID *Guid, OPTIONAL
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN PCD_CALLBACK NotificationFunction
)
{
@@ -800,7 +800,7 @@ VOID
EFIAPI
LibPcdCancelCallback (
IN CONST GUID *Guid, OPTIONAL
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN PCD_CALLBACK NotificationFunction
)
{
@@ -830,14 +830,14 @@ LibPcdCancelCallback (
@param[in] The previous PCD token number. If 0, then retrieves the first PCD
token number.
- @retval PCD_TOKEN_NUMBER The next valid token number.
+ @retval UINTN The next valid token number.
**/
-PCD_TOKEN_NUMBER
+UINTN
EFIAPI
LibPcdGetNextToken (
IN CONST GUID *Guid, OPTIONAL
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
EFI_STATUS Status;
diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
index 8ef5205593..fca14af868 100644
--- 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.
**/
-SKU_ID
+UINTN
EFIAPI
LibPcdSetSku (
- IN SKU_ID SkuId
+ IN UINTN SkuId
)
{
@@ -86,7 +86,7 @@ LibPcdSetSku (
UINT8
EFIAPI
LibPcdGet8 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
PCD_PPI * PcdPpi;
@@ -109,7 +109,7 @@ LibPcdGet8 (
UINT16
EFIAPI
LibPcdGet16 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
PCD_PPI *PcdPpi;
@@ -132,7 +132,7 @@ LibPcdGet16 (
UINT32
EFIAPI
LibPcdGet32 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
PCD_PPI * PcdPpi;
@@ -155,7 +155,7 @@ LibPcdGet32 (
UINT64
EFIAPI
LibPcdGet64 (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
PCD_PPI * PcdPpi;
@@ -178,7 +178,7 @@ LibPcdGet64 (
VOID *
EFIAPI
LibPcdGetPtr (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
PCD_PPI * PcdPpi;
@@ -201,7 +201,7 @@ LibPcdGetPtr (
BOOLEAN
EFIAPI
LibPcdGetBool (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
PCD_PPI * PcdPpi;
@@ -224,7 +224,7 @@ LibPcdGetBool (
UINTN
EFIAPI
LibPcdGetSize (
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
PCD_PPI * PcdPpi;
@@ -251,7 +251,7 @@ UINT8
EFIAPI
LibPcdGetEx8 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
PCD_PPI * PcdPpi;
@@ -278,7 +278,7 @@ UINT16
EFIAPI
LibPcdGetEx16 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
PCD_PPI * PcdPpi;
@@ -305,7 +305,7 @@ UINT32
EFIAPI
LibPcdGetEx32 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
PCD_PPI * PcdPpi;
@@ -333,7 +333,7 @@ UINT64
EFIAPI
LibPcdGetEx64 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
PCD_PPI * PcdPpi;
@@ -360,7 +360,7 @@ VOID *
EFIAPI
LibPcdGetExPtr (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
PCD_PPI * PcdPpi;
@@ -387,7 +387,7 @@ BOOLEAN
EFIAPI
LibPcdGetExBool (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
PCD_PPI * PcdPpi;
@@ -414,7 +414,7 @@ UINTN
EFIAPI
LibPcdGetExSize (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
PCD_PPI * PcdPpi;
@@ -439,7 +439,7 @@ LibPcdGetExSize (
UINT8
EFIAPI
LibPcdSet8 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
)
{
@@ -471,7 +471,7 @@ LibPcdSet8 (
UINT16
EFIAPI
LibPcdSet16 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
)
{
@@ -503,7 +503,7 @@ LibPcdSet16 (
UINT32
EFIAPI
LibPcdSet32 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
)
{
@@ -534,7 +534,7 @@ LibPcdSet32 (
UINT64
EFIAPI
LibPcdSet64 (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
)
{
@@ -567,7 +567,7 @@ LibPcdSet64 (
VOID *
EFIAPI
LibPcdSetPtr (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
)
@@ -600,7 +600,7 @@ LibPcdSetPtr (
BOOLEAN
EFIAPI
LibPcdSetBool (
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
)
{
@@ -636,7 +636,7 @@ UINT8
EFIAPI
LibPcdSetEx8 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT8 Value
)
{
@@ -672,7 +672,7 @@ UINT16
EFIAPI
LibPcdSetEx16 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT16 Value
)
{
@@ -708,7 +708,7 @@ UINT32
EFIAPI
LibPcdSetEx32 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT32 Value
)
{
@@ -744,7 +744,7 @@ UINT64
EFIAPI
LibPcdSetEx64 (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINT64 Value
)
{
@@ -781,7 +781,7 @@ VOID *
EFIAPI
LibPcdSetExPtr (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN UINTN SizeOfBuffer,
IN VOID *Buffer
)
@@ -817,7 +817,7 @@ BOOLEAN
EFIAPI
LibPcdSetExBool (
IN CONST GUID *Guid,
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN BOOLEAN Value
)
{
@@ -856,7 +856,7 @@ VOID
EFIAPI
LibPcdCallbackOnSet (
IN CONST GUID *Guid, OPTIONAL
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN PCD_CALLBACK NotificationFunction
)
{
@@ -890,7 +890,7 @@ VOID
EFIAPI
LibPcdCancelCallback (
IN CONST GUID *Guid, OPTIONAL
- IN PCD_TOKEN_NUMBER TokenNumber,
+ IN UINTN TokenNumber,
IN PCD_CALLBACK NotificationFunction
)
{
@@ -922,14 +922,14 @@ LibPcdCancelCallback (
@param[in] The previous PCD token number. If 0, then retrieves the first PCD
token number.
- @retval PCD_TOKEN_NUMBER The next valid token number.
+ @retval UINTN The next valid token number.
**/
-PCD_TOKEN_NUMBER
+UINTN
EFIAPI
LibPcdGetNextToken (
IN CONST GUID *Guid, OPTIONAL
- IN PCD_TOKEN_NUMBER TokenNumber
+ IN UINTN TokenNumber
)
{
EFI_STATUS Status;
diff --git a/Tools/Conf/Pcd/PcdDatabaseCommonDefinitions.sample b/Tools/Conf/Pcd/PcdDatabaseCommonDefinitions.sample
index 9b7d7d319f..d441aa0515 100644
--- a/Tools/Conf/Pcd/PcdDatabaseCommonDefinitions.sample
+++ b/Tools/Conf/Pcd/PcdDatabaseCommonDefinitions.sample
@@ -5,6 +5,8 @@
//
// Common definitions
//
+typedef UINT8 SKU_ID;
+
#define PCD_TYPE_SHIFT 24
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 18:54:07 +0000