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

64
EdkModulePkg/Universal/PCD/Dxe/Pcd.c
View File

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

24
EdkModulePkg/Universal/PCD/Dxe/Service.c
View File

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

80
EdkModulePkg/Universal/PCD/Dxe/Service.h
View File

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