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

MdeModulePkg: Apply uncrustify changes

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the MdeModulePkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
This commit is contained in:
Michael Kubacki
2021-12-05 14:54:02 -08:00
committed by mergify[bot]
parent 7c7184e201
commit 1436aea4d5
994 changed files with 107608 additions and 101311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

357
MdeModulePkg/Universal/PCD/Dxe/Pcd.c
View File

@@ -13,13 +13,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
///
/// PCD database lock.
///
EFI_LOCK mPcdDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE(TPL_NOTIFY);
EFI_LOCK mPcdDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_NOTIFY);
///
/// PCD_PROTOCOL the EDKII native implementation which support dynamic
/// type and dynamicEx type PCDs.
///
PCD_PROTOCOL mPcdInstance = {
PCD_PROTOCOL mPcdInstance = {
DxePcdSetSku,
DxePcdGet8,
@@ -62,7 +62,7 @@ PCD_PROTOCOL mPcdInstance = {
/// EFI_PCD_PROTOCOL is defined in PI 1.2 Vol 3 which only support dynamicEx type
/// PCD.
///
EFI_PCD_PROTOCOL mEfiPcdInstance = {
EFI_PCD_PROTOCOL mEfiPcdInstance = {
DxePcdSetSku,
DxePcdGet8Ex,
DxePcdGet16Ex,
@@ -77,8 +77,8 @@ EFI_PCD_PROTOCOL mEfiPcdInstance = {
DxePcdSet64Ex,
DxePcdSetPtrEx,
DxePcdSetBoolEx,
(EFI_PCD_PROTOCOL_CALLBACK_ON_SET) DxeRegisterCallBackOnSet,
(EFI_PCD_PROTOCOL_CANCEL_CALLBACK) DxeUnRegisterCallBackOnSet,
(EFI_PCD_PROTOCOL_CALLBACK_ON_SET)DxeRegisterCallBackOnSet,
(EFI_PCD_PROTOCOL_CANCEL_CALLBACK)DxeUnRegisterCallBackOnSet,
DxePcdGetNextToken,
DxePcdGetNextTokenSpace
};
@@ -87,7 +87,7 @@ EFI_PCD_PROTOCOL mEfiPcdInstance = {
/// Instance of GET_PCD_INFO_PROTOCOL protocol is EDKII native implementation.
/// This protocol instance support dynamic and dynamicEx type PCDs.
///
GET_PCD_INFO_PROTOCOL mGetPcdInfoInstance = {
GET_PCD_INFO_PROTOCOL mGetPcdInfoInstance = {
DxeGetPcdInfoGetInfo,
DxeGetPcdInfoGetInfoEx,
DxeGetPcdInfoGetSku
@@ -102,8 +102,8 @@ EFI_GET_PCD_INFO_PROTOCOL mEfiGetPcdInfoInstance = {
DxeGetPcdInfoGetSku
};
EFI_HANDLE mPcdHandle = NULL;
UINTN mVpdBaseAddress = 0;
EFI_HANDLE mPcdHandle = NULL;
UINTN mVpdBaseAddress = 0;
/**
Main entry for PCD DXE driver.
@@ -119,12 +119,12 @@ UINTN mVpdBaseAddress = 0;
EFI_STATUS
EFIAPI
PcdDxeInit (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
{
EFI_STATUS Status;
VOID *Registration;
EFI_STATUS Status;
VOID *Registration;
//
// Make sure the Pcd Protocol is not already installed in the system
@@ -140,8 +140,10 @@ PcdDxeInit (
//
Status = gBS->InstallMultipleProtocolInterfaces (
&mPcdHandle,
&gPcdProtocolGuid, &mPcdInstance,
&gEfiPcdProtocolGuid, &mEfiPcdInstance,
&gPcdProtocolGuid,
&mPcdInstance,
&gEfiPcdProtocolGuid,
&mEfiPcdInstance,
NULL
);
ASSERT_EFI_ERROR (Status);
@@ -152,8 +154,10 @@ PcdDxeInit (
//
Status = gBS->InstallMultipleProtocolInterfaces (
&mPcdHandle,
&gGetPcdInfoProtocolGuid, &mGetPcdInfoInstance,
&gEfiGetPcdInfoProtocolGuid, &mEfiGetPcdInfoInstance,
&gGetPcdInfoProtocolGuid,
&mGetPcdInfoInstance,
&gEfiGetPcdInfoProtocolGuid,
&mEfiGetPcdInfoInstance,
NULL
);
ASSERT_EFI_ERROR (Status);
@@ -177,12 +181,12 @@ PcdDxeInit (
//
// PcdVpdBaseAddress64 is DynamicEx PCD only. So, DxePcdGet64Ex() is used to get its value.
//
mVpdBaseAddress = (UINTN) DxePcdGet64Ex (&gEfiMdeModulePkgTokenSpaceGuid, PcdToken (PcdVpdBaseAddress64));
mVpdBaseAddress = (UINTN)DxePcdGet64Ex (&gEfiMdeModulePkgTokenSpaceGuid, PcdToken (PcdVpdBaseAddress64));
if (mVpdBaseAddress == 0) {
//
// PcdVpdBaseAddress64 is not set, get value from PcdVpdBaseAddress.
//
mVpdBaseAddress = (UINTN) PcdGet32 (PcdVpdBaseAddress);
mVpdBaseAddress = (UINTN)PcdGet32 (PcdVpdBaseAddress);
}
return Status;
@@ -204,8 +208,8 @@ PcdDxeInit (
EFI_STATUS
EFIAPI
DxeGetPcdInfoGetInfo (
IN UINTN TokenNumber,
OUT EFI_PCD_INFO *PcdInfo
IN UINTN TokenNumber,
OUT EFI_PCD_INFO *PcdInfo
)
{
return DxeGetPcdInfo (NULL, TokenNumber, PcdInfo);
@@ -228,9 +232,9 @@ DxeGetPcdInfoGetInfo (
EFI_STATUS
EFIAPI
DxeGetPcdInfoGetInfoEx (
IN CONST EFI_GUID *Guid,
IN UINTN TokenNumber,
OUT EFI_PCD_INFO *PcdInfo
IN CONST EFI_GUID *Guid,
IN UINTN TokenNumber,
OUT EFI_PCD_INFO *PcdInfo
)
{
return DxeGetPcdInfo (Guid, TokenNumber, PcdInfo);
@@ -249,7 +253,7 @@ DxeGetPcdInfoGetSku (
VOID
)
{
return (UINTN) mPcdDatabase.DxeDb->SystemSkuId;
return (UINTN)mPcdDatabase.DxeDb->SystemSkuId;
}
/**
@@ -276,14 +280,14 @@ DxeGetPcdInfoGetSku (
VOID
EFIAPI
DxePcdSetSku (
IN UINTN SkuId
IN UINTN SkuId
)
{
SKU_ID *SkuIdTable;
UINTN Index;
EFI_STATUS Status;
SKU_ID *SkuIdTable;
UINTN Index;
EFI_STATUS Status;
DEBUG ((DEBUG_INFO, "PcdDxe - SkuId 0x%lx is to be set.\n", (SKU_ID) SkuId));
DEBUG ((DEBUG_INFO, "PcdDxe - SkuId 0x%lx is to be set.\n", (SKU_ID)SkuId));
if (SkuId == mPcdDatabase.DxeDb->SystemSkuId) {
//
@@ -293,26 +297,26 @@ DxePcdSetSku (
return;
}
if (mPcdDatabase.DxeDb->SystemSkuId != (SKU_ID) 0) {
if (mPcdDatabase.DxeDb->SystemSkuId != (SKU_ID)0) {
DEBUG ((DEBUG_ERROR, "PcdDxe - The SKU Id could be changed only once."));
DEBUG ((
DEBUG_ERROR,
"PcdDxe - The SKU Id was set to 0x%lx already, it could not be set to 0x%lx any more.",
mPcdDatabase.DxeDb->SystemSkuId,
(SKU_ID) SkuId
(SKU_ID)SkuId
));
ASSERT (FALSE);
return;
}
SkuIdTable = (SKU_ID *) ((UINT8 *) mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->SkuIdTableOffset);
SkuIdTable = (SKU_ID *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->SkuIdTableOffset);
for (Index = 0; Index < SkuIdTable[0]; Index++) {
if (SkuId == SkuIdTable[Index + 1]) {
DEBUG ((DEBUG_INFO, "PcdDxe - SkuId is found in SkuId table.\n"));
Status = UpdatePcdDatabase (SkuId, TRUE);
if (!EFI_ERROR (Status)) {
mPcdDatabase.DxeDb->SystemSkuId = (SKU_ID) SkuId;
DEBUG ((DEBUG_INFO, "PcdDxe - Set current SKU Id to 0x%lx.\n", (SKU_ID) SkuId));
mPcdDatabase.DxeDb->SystemSkuId = (SKU_ID)SkuId;
DEBUG ((DEBUG_INFO, "PcdDxe - Set current SKU Id to 0x%lx.\n", (SKU_ID)SkuId));
return;
}
}
@@ -339,10 +343,10 @@ DxePcdSetSku (
UINT8
EFIAPI
DxePcdGet8 (
IN UINTN TokenNumber
IN UINTN TokenNumber
)
{
return *((UINT8 *) GetWorker (TokenNumber, sizeof (UINT8)));
return *((UINT8 *)GetWorker (TokenNumber, sizeof (UINT8)));
}
/**
@@ -359,7 +363,7 @@ DxePcdGet8 (
UINT16
EFIAPI
DxePcdGet16 (
IN UINTN TokenNumber
IN UINTN TokenNumber
)
{
return ReadUnaligned16 (GetWorker (TokenNumber, sizeof (UINT16)));
@@ -379,7 +383,7 @@ DxePcdGet16 (
UINT32
EFIAPI
DxePcdGet32 (
IN UINTN TokenNumber
IN UINTN TokenNumber
)
{
return ReadUnaligned32 (GetWorker (TokenNumber, sizeof (UINT32)));
@@ -399,10 +403,10 @@ DxePcdGet32 (
UINT64
EFIAPI
DxePcdGet64 (
IN UINTN TokenNumber
IN UINTN TokenNumber
)
{
return ReadUnaligned64(GetWorker (TokenNumber, sizeof (UINT64)));
return ReadUnaligned64 (GetWorker (TokenNumber, sizeof (UINT64)));
}
/**
@@ -421,7 +425,7 @@ DxePcdGet64 (
VOID *
EFIAPI
DxePcdGetPtr (
IN UINTN TokenNumber
IN UINTN TokenNumber
)
{
return GetWorker (TokenNumber, 0);
@@ -443,10 +447,10 @@ DxePcdGetPtr (
BOOLEAN
EFIAPI
DxePcdGetBool (
IN UINTN TokenNumber
IN UINTN TokenNumber
)
{
return *((BOOLEAN *) GetWorker (TokenNumber, sizeof (BOOLEAN)));
return *((BOOLEAN *)GetWorker (TokenNumber, sizeof (BOOLEAN)));
}
/**
@@ -463,14 +467,15 @@ DxePcdGetBool (
UINTN
EFIAPI
DxePcdGetSize (
IN UINTN TokenNumber
IN UINTN TokenNumber
)
{
UINTN Size;
UINT32 *LocalTokenNumberTable;
BOOLEAN IsPeiDb;
UINTN MaxSize;
UINTN TmpTokenNumber;
UINTN Size;
UINT32 *LocalTokenNumberTable;
BOOLEAN IsPeiDb;
UINTN MaxSize;
UINTN TmpTokenNumber;
//
// TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.
// We have to decrement TokenNumber by 1 to make it usable
@@ -491,10 +496,10 @@ DxePcdGetSize (
// EBC compiler is very choosy. It may report warning about comparison
// between UINTN and 0 . So we add 1 in each size of the
// comparison.
IsPeiDb = (BOOLEAN) (TokenNumber + 1 < mPeiLocalTokenCount + 1);
IsPeiDb = (BOOLEAN)(TokenNumber + 1 < mPeiLocalTokenCount + 1);
TokenNumber = IsPeiDb ? TokenNumber :
(TokenNumber - mPeiLocalTokenCount);
(TokenNumber - mPeiLocalTokenCount);
LocalTokenNumberTable = IsPeiDb ? (UINT32 *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->LocalTokenNumberTableOffset)
: (UINT32 *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->LocalTokenNumberTableOffset);
@@ -509,7 +514,6 @@ DxePcdGetSize (
} else {
return Size;
}
}
/**
@@ -529,11 +533,11 @@ DxePcdGetSize (
UINT8
EFIAPI
DxePcdGet8Ex (
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber
)
{
return *((UINT8 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT8)));
return *((UINT8 *)ExGetWorker (Guid, ExTokenNumber, sizeof (UINT8)));
}
/**
@@ -553,11 +557,11 @@ DxePcdGet8Ex (
UINT16
EFIAPI
DxePcdGet16Ex (
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber
)
{
return ReadUnaligned16 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT16)));
return ReadUnaligned16 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT16)));
}
/**
@@ -577,11 +581,11 @@ DxePcdGet16Ex (
UINT32
EFIAPI
DxePcdGet32Ex (
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber
)
{
return ReadUnaligned32 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT32)));
return ReadUnaligned32 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT32)));
}
/**
@@ -601,11 +605,11 @@ DxePcdGet32Ex (
UINT64
EFIAPI
DxePcdGet64Ex (
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber
)
{
return ReadUnaligned64 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT64)));
return ReadUnaligned64 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT64)));
}
/**
@@ -625,11 +629,11 @@ DxePcdGet64Ex (
VOID *
EFIAPI
DxePcdGetPtrEx (
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber
)
{
return ExGetWorker (Guid, ExTokenNumber, 0);
return ExGetWorker (Guid, ExTokenNumber, 0);
}
/**
@@ -649,11 +653,11 @@ DxePcdGetPtrEx (
BOOLEAN
EFIAPI
DxePcdGetBoolEx (
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber
)
{
return *((BOOLEAN *) ExGetWorker (Guid, ExTokenNumber, sizeof(BOOLEAN)));
return *((BOOLEAN *)ExGetWorker (Guid, ExTokenNumber, sizeof (BOOLEAN)));
}
/**
@@ -671,11 +675,11 @@ DxePcdGetBoolEx (
UINTN
EFIAPI
DxePcdGetSizeEx (
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber
)
{
return DxePcdGetSize(GetExPcdTokenNumber (Guid, (UINT32) ExTokenNumber));
return DxePcdGetSize (GetExPcdTokenNumber (Guid, (UINT32)ExTokenNumber));
}
/**
@@ -698,8 +702,8 @@ DxePcdGetSizeEx (
EFI_STATUS
EFIAPI
DxePcdSet8 (
IN UINTN TokenNumber,
IN UINT8 Value
IN UINTN TokenNumber,
IN UINT8 Value
)
{
return SetValueWorker (TokenNumber, &Value, sizeof (Value));
@@ -725,8 +729,8 @@ DxePcdSet8 (
EFI_STATUS
EFIAPI
DxePcdSet16 (
IN UINTN TokenNumber,
IN UINT16 Value
IN UINTN TokenNumber,
IN UINT16 Value
)
{
return SetValueWorker (TokenNumber, &Value, sizeof (Value));
@@ -752,8 +756,8 @@ DxePcdSet16 (
EFI_STATUS
EFIAPI
DxePcdSet32 (
IN UINTN TokenNumber,
IN UINT32 Value
IN UINTN TokenNumber,
IN UINT32 Value
)
{
return SetValueWorker (TokenNumber, &Value, sizeof (Value));
@@ -779,8 +783,8 @@ DxePcdSet32 (
EFI_STATUS
EFIAPI
DxePcdSet64 (
IN UINTN TokenNumber,
IN UINT64 Value
IN UINTN TokenNumber,
IN UINT64 Value
)
{
return SetValueWorker (TokenNumber, &Value, sizeof (Value));
@@ -810,9 +814,9 @@ DxePcdSet64 (
EFI_STATUS
EFIAPI
DxePcdSetPtr (
IN UINTN TokenNumber,
IN OUT UINTN *SizeOfBuffer,
IN VOID *Buffer
IN UINTN TokenNumber,
IN OUT UINTN *SizeOfBuffer,
IN VOID *Buffer
)
{
return SetWorker (TokenNumber, Buffer, SizeOfBuffer, TRUE);
@@ -838,8 +842,8 @@ DxePcdSetPtr (
EFI_STATUS
EFIAPI
DxePcdSetBool (
IN UINTN TokenNumber,
IN BOOLEAN Value
IN UINTN TokenNumber,
IN BOOLEAN Value
)
{
return SetValueWorker (TokenNumber, &Value, sizeof (Value));
@@ -866,12 +870,12 @@ DxePcdSetBool (
EFI_STATUS
EFIAPI
DxePcdSet8Ex (
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber,
IN UINT8 Value
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber,
IN UINT8 Value
)
{
return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));
return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));
}
/**
@@ -895,17 +899,19 @@ DxePcdSet8Ex (
EFI_STATUS
EFIAPI
DxePcdSet16Ex (
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber,
IN UINT16 Value
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber,
IN UINT16 Value
)
{
//
// PcdSetNvStoreDefaultId should be set in PEI phase to take effect.
//
ASSERT (!(CompareGuid (Guid, &gEfiMdeModulePkgTokenSpaceGuid) &&
(ExTokenNumber == PcdToken(PcdSetNvStoreDefaultId))));
return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));
ASSERT (
!(CompareGuid (Guid, &gEfiMdeModulePkgTokenSpaceGuid) &&
(ExTokenNumber == PcdToken (PcdSetNvStoreDefaultId)))
);
return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));
}
/**
@@ -929,12 +935,12 @@ DxePcdSet16Ex (
EFI_STATUS
EFIAPI
DxePcdSet32Ex (
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber,
IN UINT32 Value
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber,
IN UINT32 Value
)
{
return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));
return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));
}
/**
@@ -958,12 +964,12 @@ DxePcdSet32Ex (
EFI_STATUS
EFIAPI
DxePcdSet64Ex (
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber,
IN UINT64 Value
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber,
IN UINT64 Value
)
{
return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));
return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));
}
/**
@@ -991,13 +997,13 @@ DxePcdSet64Ex (
EFI_STATUS
EFIAPI
DxePcdSetPtrEx (
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber,
IN OUT UINTN *SizeOfBuffer,
IN VOID *Buffer
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber,
IN OUT UINTN *SizeOfBuffer,
IN VOID *Buffer
)
{
return ExSetWorker(ExTokenNumber, Guid, Buffer, SizeOfBuffer, TRUE);
return ExSetWorker (ExTokenNumber, Guid, Buffer, SizeOfBuffer, TRUE);
}
/**
@@ -1021,12 +1027,12 @@ DxePcdSetPtrEx (
EFI_STATUS
EFIAPI
DxePcdSetBoolEx (
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber,
IN BOOLEAN Value
IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber,
IN BOOLEAN Value
)
{
return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));
return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));
}
/**
@@ -1044,16 +1050,17 @@ DxePcdSetBoolEx (
EFI_STATUS
EFIAPI
DxeRegisterCallBackOnSet (
IN CONST EFI_GUID *Guid OPTIONAL,
IN UINTN TokenNumber,
IN PCD_PROTOCOL_CALLBACK CallBackFunction
IN CONST EFI_GUID *Guid OPTIONAL,
IN UINTN TokenNumber,
IN PCD_PROTOCOL_CALLBACK CallBackFunction
)
{
EFI_STATUS Status;
EFI_STATUS Status;
if (CallBackFunction == NULL) {
return EFI_INVALID_PARAMETER;
}
//
// Aquire lock to prevent reentrance from TPL_CALLBACK level
//
@@ -1081,12 +1088,12 @@ DxeRegisterCallBackOnSet (
EFI_STATUS
EFIAPI
DxeUnRegisterCallBackOnSet (
IN CONST EFI_GUID *Guid OPTIONAL,
IN UINTN TokenNumber,
IN PCD_PROTOCOL_CALLBACK CallBackFunction
IN CONST EFI_GUID *Guid OPTIONAL,
IN UINTN TokenNumber,
IN PCD_PROTOCOL_CALLBACK CallBackFunction
)
{
EFI_STATUS Status;
EFI_STATUS Status;
if (CallBackFunction == NULL) {
return EFI_INVALID_PARAMETER;
@@ -1133,15 +1140,15 @@ DxeUnRegisterCallBackOnSet (
EFI_STATUS
EFIAPI
DxePcdGetNextToken (
IN CONST EFI_GUID *Guid OPTIONAL,
IN OUT UINTN *TokenNumber
IN CONST EFI_GUID *Guid OPTIONAL,
IN OUT UINTN *TokenNumber
)
{
EFI_STATUS Status;
BOOLEAN PeiExMapTableEmpty;
BOOLEAN DxeExMapTableEmpty;
EFI_STATUS Status;
BOOLEAN PeiExMapTableEmpty;
BOOLEAN DxeExMapTableEmpty;
Status = EFI_NOT_FOUND;
Status = EFI_NOT_FOUND;
PeiExMapTableEmpty = mPeiExMapTableEmpty;
DxeExMapTableEmpty = mDxeExMapTableEmpty;
@@ -1153,13 +1160,15 @@ DxePcdGetNextToken (
// between UINTN and 0 . So we add 1 in each size of the
// comparison.
if (((*TokenNumber + 1 > mPeiNexTokenCount + 1) && (*TokenNumber + 1 <= mPeiLocalTokenCount + 1)) ||
((*TokenNumber + 1 > (mPeiLocalTokenCount + mDxeNexTokenCount + 1)))) {
((*TokenNumber + 1 > (mPeiLocalTokenCount + mDxeNexTokenCount + 1))))
{
return EFI_NOT_FOUND;
}
(*TokenNumber)++;
if ((*TokenNumber + 1 > mPeiNexTokenCount + 1) &&
(*TokenNumber + 1 <= mPeiLocalTokenCount + 1)) {
(*TokenNumber + 1 <= mPeiLocalTokenCount + 1))
{
//
// The first Non-Ex type Token Number for DXE PCD
// database is mPeiLocalTokenCount + 1
@@ -1174,6 +1183,7 @@ DxePcdGetNextToken (
*TokenNumber = PCD_INVALID_TOKEN_NUMBER;
return EFI_NOT_FOUND;
}
return EFI_SUCCESS;
}
@@ -1183,13 +1193,13 @@ DxePcdGetNextToken (
if (!PeiExMapTableEmpty) {
Status = ExGetNextTokeNumber (
Guid,
TokenNumber,
(EFI_GUID *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->GuidTableOffset),
mPeiGuidTableSize,
(DYNAMICEX_MAPPING *)((UINT8 *) mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->ExMapTableOffset),
mPeiExMapppingTableSize
);
Guid,
TokenNumber,
(EFI_GUID *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->GuidTableOffset),
mPeiGuidTableSize,
(DYNAMICEX_MAPPING *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->ExMapTableOffset),
mPeiExMapppingTableSize
);
}
if (Status == EFI_SUCCESS) {
@@ -1198,13 +1208,13 @@ DxePcdGetNextToken (
if (!DxeExMapTableEmpty) {
Status = ExGetNextTokeNumber (
Guid,
TokenNumber,
(EFI_GUID *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->GuidTableOffset),
mDxeGuidTableSize,
(DYNAMICEX_MAPPING *)((UINT8 *) mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->ExMapTableOffset),
mDxeExMapppingTableSize
);
Guid,
TokenNumber,
(EFI_GUID *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->GuidTableOffset),
mDxeGuidTableSize,
(DYNAMICEX_MAPPING *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->ExMapTableOffset),
mDxeExMapppingTableSize
);
}
return Status;
@@ -1222,9 +1232,9 @@ DxePcdGetNextToken (
**/
EFI_GUID **
GetDistinctTokenSpace (
IN OUT UINTN *ExMapTableSize,
IN DYNAMICEX_MAPPING *ExMapTable,
IN EFI_GUID *GuidTable
IN OUT UINTN *ExMapTableSize,
IN DYNAMICEX_MAPPING *ExMapTable,
IN EFI_GUID *GuidTable
)
{
EFI_GUID **DistinctTokenSpace;
@@ -1237,11 +1247,11 @@ GetDistinctTokenSpace (
DistinctTokenSpace = AllocateZeroPool (*ExMapTableSize * sizeof (EFI_GUID *));
ASSERT (DistinctTokenSpace != NULL);
TsIdx = 0;
OldGuidIndex = ExMapTable[0].ExGuidIndex;
TsIdx = 0;
OldGuidIndex = ExMapTable[0].ExGuidIndex;
DistinctTokenSpace[TsIdx] = &GuidTable[OldGuidIndex];
for (Idx = 1; Idx < *ExMapTableSize; Idx++) {
Match = FALSE;
Match = FALSE;
OldGuidIndex = ExMapTable[Idx].ExGuidIndex;
for (TempTsIdx = 0; TempTsIdx <= TsIdx; TempTsIdx++) {
if (&GuidTable[OldGuidIndex] == DistinctTokenSpace[TempTsIdx]) {
@@ -1252,6 +1262,7 @@ GetDistinctTokenSpace (
break;
}
}
if (!Match) {
DistinctTokenSpace[++TsIdx] = &GuidTable[OldGuidIndex];
}
@@ -1264,7 +1275,6 @@ GetDistinctTokenSpace (
//
*ExMapTableSize = TsIdx + 1;
return DistinctTokenSpace;
}
/**
@@ -1286,19 +1296,19 @@ GetDistinctTokenSpace (
EFI_STATUS
EFIAPI
DxePcdGetNextTokenSpace (
IN OUT CONST EFI_GUID **Guid
IN OUT CONST EFI_GUID **Guid
)
{
UINTN Idx;
UINTN Idx2;
UINTN Idx3;
UINTN PeiTokenSpaceTableSize;
UINTN DxeTokenSpaceTableSize;
EFI_GUID **PeiTokenSpaceTable;
EFI_GUID **DxeTokenSpaceTable;
BOOLEAN Match;
BOOLEAN PeiExMapTableEmpty;
BOOLEAN DxeExMapTableEmpty;
UINTN Idx;
UINTN Idx2;
UINTN Idx3;
UINTN PeiTokenSpaceTableSize;
UINTN DxeTokenSpaceTableSize;
EFI_GUID **PeiTokenSpaceTable;
EFI_GUID **DxeTokenSpaceTable;
BOOLEAN Match;
BOOLEAN PeiExMapTableEmpty;
BOOLEAN DxeExMapTableEmpty;
ASSERT (Guid != NULL);
@@ -1313,22 +1323,24 @@ DxePcdGetNextTokenSpace (
PeiTokenSpaceTableSize = 0;
if (!PeiExMapTableEmpty) {
PeiTokenSpaceTableSize = mPeiExMapppingTableSize / sizeof(DYNAMICEX_MAPPING);
PeiTokenSpaceTable = GetDistinctTokenSpace (&PeiTokenSpaceTableSize,
(DYNAMICEX_MAPPING *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->ExMapTableOffset),
(EFI_GUID *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->GuidTableOffset)
);
CopyMem (TmpTokenSpaceBuffer, PeiTokenSpaceTable, sizeof (EFI_GUID*) * PeiTokenSpaceTableSize);
PeiTokenSpaceTableSize = mPeiExMapppingTableSize / sizeof (DYNAMICEX_MAPPING);
PeiTokenSpaceTable = GetDistinctTokenSpace (
&PeiTokenSpaceTableSize,
(DYNAMICEX_MAPPING *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->ExMapTableOffset),
(EFI_GUID *)((UINT8 *)mPcdDatabase.PeiDb + mPcdDatabase.PeiDb->GuidTableOffset)
);
CopyMem (TmpTokenSpaceBuffer, PeiTokenSpaceTable, sizeof (EFI_GUID *) * PeiTokenSpaceTableSize);
TmpTokenSpaceBufferCount = PeiTokenSpaceTableSize;
FreePool (PeiTokenSpaceTable);
}
if (!DxeExMapTableEmpty) {
DxeTokenSpaceTableSize = mDxeExMapppingTableSize / sizeof(DYNAMICEX_MAPPING);
DxeTokenSpaceTable = GetDistinctTokenSpace (&DxeTokenSpaceTableSize,
(DYNAMICEX_MAPPING *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->ExMapTableOffset),
(EFI_GUID *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->GuidTableOffset)
);
DxeTokenSpaceTableSize = mDxeExMapppingTableSize / sizeof (DYNAMICEX_MAPPING);
DxeTokenSpaceTable = GetDistinctTokenSpace (
&DxeTokenSpaceTableSize,
(DYNAMICEX_MAPPING *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->ExMapTableOffset),
(EFI_GUID *)((UINT8 *)mPcdDatabase.DxeDb + mPcdDatabase.DxeDb->GuidTableOffset)
);
//
// Make sure EFI_GUID in DxeTokenSpaceTable does not exist in PeiTokenSpaceTable
@@ -1341,6 +1353,7 @@ DxePcdGetNextTokenSpace (
break;
}
}
if (!Match) {
TmpTokenSpaceBuffer[Idx3++] = DxeTokenSpaceTable[Idx2];
}