From f806dd277eb32d04e268c08620d619bfcae723be Mon Sep 17 00:00:00 2001 From: lgao4 Date: Wed, 25 Feb 2009 09:04:47 +0000 Subject: Use single one PcdFrameworkCompatibilitySupport PCD to support framework HII and FvHob. Remove patchable type Flash related PCD. Simplify single one PcdPeiFullPcdDatabaseEnable to produce full or minimal Pei PCD services. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7678 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Universal/PCD/Dxe/Pcd.c | 13 +------------ MdeModulePkg/Universal/PCD/Dxe/Pcd.inf | 3 --- MdeModulePkg/Universal/PCD/Pei/Pcd.c | 21 ++++----------------- MdeModulePkg/Universal/PCD/Pei/Pcd.inf | 8 ++------ MdeModulePkg/Universal/PCD/Pei/Service.c | 11 +++-------- 5 files changed, 10 insertions(+), 46 deletions(-) (limited to 'MdeModulePkg/Universal/PCD') diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c index 0c44a64077..db9594abf8 100644 --- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c +++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c @@ -948,10 +948,6 @@ DxePcdGetNextToken ( BOOLEAN PeiExMapTableEmpty; BOOLEAN DxeExMapTableEmpty; - if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) { - return EFI_UNSUPPORTED; - } - Status = EFI_NOT_FOUND; PeiExMapTableEmpty = PEI_EXMAP_TABLE_EMPTY; DxeExMapTableEmpty = DXE_EXMAP_TABLE_EMPTY; @@ -1065,14 +1061,11 @@ GetDistinctTokenSpace ( /** Get next token space in PCD database according to given token space guid. - This routine is enable only when feature flag PCD PcdDxePcdDatabaseTraverseEnabled - is TRUE. - @param Guid Given token space guid. If NULL, then Guid will be set to the first PCD token space in PCD database, If not NULL, then Guid will be set to next PCD token space. - @retval EFI_UNSUPPORTED If feature flag PCD PcdDxePcdDatabaseTraverseEnabled is FALSE. + @retval EFI_UNSUPPORTED @retval EFI_NOT_FOUND If PCD database has no token space table or can not find given token space in PCD database. @retval EFI_SUCCESS Success to get next token space guid. @@ -1094,10 +1087,6 @@ DxePcdGetNextTokenSpace ( BOOLEAN PeiExMapTableEmpty; BOOLEAN DxeExMapTableEmpty; - if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) { - return EFI_UNSUPPORTED; - } - ASSERT (Guid != NULL); PeiExMapTableEmpty = PEI_EXMAP_TABLE_EMPTY; diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf index 345e9f6fe4..93758ff332 100644 --- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf @@ -57,9 +57,6 @@ [Protocols] gPcdProtocolGuid ## PRODUCES -[FeaturePcd.common] - gEfiMdeModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled - [FixedPcd.common] gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c index 41b34269a0..ecbdc94662 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c +++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c @@ -260,15 +260,6 @@ PeiPcdGetSize ( UINTN Size; UINTN MaxSize; - // - // If DebugAssertEnabled is TRUE, we still need to provide the GET size - // function as GetWorker and SetWoker need this function to do ASSERT. - // - if ((!FeaturePcdGet(PcdPeiPcdDatabaseGetSizeEnabled)) && - (!DebugAssertEnabled ())) { - return 0; - } - PeiPcdDb = GetPcdDatabase (); // // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER. @@ -458,10 +449,6 @@ PeiPcdGetSizeEx ( IN UINTN ExTokenNumber ) { - if ((!FeaturePcdGet (PcdPeiPcdDatabaseGetSizeEnabled)) || !FeaturePcdGet (PcdPeiPcdDatabaseExEnabled)) { - return 0; - } - return PeiPcdGetSize (GetExPcdTokenNumber (Guid, ExTokenNumber)); } @@ -831,7 +818,7 @@ PeiRegisterCallBackOnSet ( IN PCD_PPI_CALLBACK CallBackFunction ) { - if (!FeaturePcdGet(PcdPeiPcdDatabaseCallbackOnSetEnabled)) { + if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) { return EFI_UNSUPPORTED; } @@ -862,7 +849,7 @@ PcdUnRegisterCallBackOnSet ( IN PCD_PPI_CALLBACK CallBackFunction ) { - if (!FeaturePcdGet(PcdPeiPcdDatabaseCallbackOnSetEnabled)) { + if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) { return EFI_UNSUPPORTED; } @@ -906,7 +893,7 @@ PeiPcdGetNextToken ( BOOLEAN Found; BOOLEAN PeiExMapTableEmpty; - if (!FeaturePcdGet (PcdPeiPcdDatabaseTraverseEnabled)) { + if (!FeaturePcdGet (PcdPeiFullPcdDatabaseEnable)) { return EFI_UNSUPPORTED; } @@ -1023,7 +1010,7 @@ PeiPcdGetNextTokenSpace ( BOOLEAN Found; BOOLEAN PeiExMapTableEmpty; - if (!FeaturePcdGet (PcdPeiPcdDatabaseTraverseEnabled)) { + if (!FeaturePcdGet (PcdPeiFullPcdDatabaseEnable)) { return EFI_UNSUPPORTED; } diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf index c00cbbeddf..91c38127fd 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf +++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf @@ -55,15 +55,11 @@ gPcdPpiGuid ## PRODUCES [FeaturePcd.common] - gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled - gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseExEnabled - gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseCallbackOnSetEnabled - gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled - gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseTraverseEnabled + gEfiMdeModulePkgTokenSpaceGuid.PcdPeiFullPcdDatabaseEnable [FixedPcd.common] gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry || PcdPeiPcdDatabaseCallbackOnSetEnabled + gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry || PcdPeiFullPcdDatabaseEnable [Depex] TRUE diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c index 10cc228433..5bc1dc8205 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Service.c +++ b/MdeModulePkg/Universal/PCD/Pei/Service.c @@ -360,7 +360,7 @@ SetWorker ( VOID *InternalData; UINTN MaxSize; - if (!FeaturePcdGet(PcdPeiPcdDatabaseSetEnabled)) { + if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) { return EFI_UNSUPPORTED; } @@ -514,7 +514,7 @@ ExSetWorker ( { UINTN TokenNumber; - if (!FeaturePcdGet(PcdPeiPcdDatabaseSetEnabled)) { + if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) { return EFI_UNSUPPORTED; } @@ -542,12 +542,7 @@ ExGetWorker ( IN UINTN ExTokenNumber, IN UINTN GetSize ) -{ - if (!FeaturePcdGet (PcdPeiPcdDatabaseExEnabled)) { - ASSERT (FALSE); - return 0; - } - +{ return GetWorker (GetExPcdTokenNumber (Guid, ExTokenNumber), GetSize); } -- cgit v1.2.3