sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
qwang12
2006-06-07 12:31:33 +00:00
parent 4347544299
commit 8a43e8dd55
13 changed files with 364 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
EdkModulePkg/Universal/PCD/Pei/Pcd.c
View File

@@ -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;

16
EdkModulePkg/Universal/PCD/Pei/Service.c
View File

@@ -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

74
EdkModulePkg/Universal/PCD/Pei/Service.h
View File

@@ -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
)
;