diff options
7 files changed, 27 insertions, 32 deletions
diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c index 3a1888d..1695aab 100644 --- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c +++ b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c @@ -15,8 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
-#include <Guid/CustomDecompress.h>
#include "BaseUefiTianoCustomDecompressLibInternals.h"
+#include <Guid/CustomDecompress.h>
/**
Shift mBitBuf NumOfBits left. Read in NumOfBits of bits from source.
@@ -815,7 +815,7 @@ TianoDecompress ( @retval RETURN_SUCCESS Register successfully.
@retval RETURN_OUT_OF_RESOURCES No enough memory to store this handler.
**/
-EFI_STATUS
+RETURN_STATUS
EFIAPI
TianoDecompressLibConstructor (
)
diff --git a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c index a524fc3..6dd4732 100644 --- a/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c +++ b/IntelFrameworkModulePkg/Universal/PcatSingleSegmentPciCfgPei/PciCfg2.c @@ -265,15 +265,16 @@ PciCfg2Modify ( This routine will install EFI_PEI_PCI_CFG2_PPI or EFI_PEI_PCI_CFG_PPI
according to PeiServices's version.
- @param FfsHeader Image's header
- @param PeiServices Pointer of EFI_PEI_SERVICES
+ @param FileHandle Handle of the file being invoked.
+ @param PeiServices Describes the list of possible PEI Services.
+
@return Whether success to install service
**/
EFI_STATUS
EFIAPI
PeimInitializePciCfg (
- IN EFI_FFS_FILE_HEADER *FfsHeader,
- IN EFI_PEI_SERVICES **PeiServices
+ IN EFI_PEI_FILE_HANDLE FileHandle,
+ IN CONST EFI_PEI_SERVICES **PeiServices
)
{
EFI_STATUS Status;
@@ -292,16 +293,16 @@ PeimInitializePciCfg ( // FrameworkPeiServices = (FRAMEWORK_PEI_SERVICES **) PeiServices;
// (**FrameworkPeiServices).PciCfg = &mPciCfgPpi;
//
- (**PeiServices).PciCfg = (EFI_PEI_PCI_CFG2_PPI *) &gPciCfgPpi;
+ (**(EFI_PEI_SERVICES**)PeiServices).PciCfg = (EFI_PEI_PCI_CFG2_PPI *) &gPciCfgPpi;
} else {
- (**PeiServices).PciCfg = &gPciCfg2Ppi;
+ (**(EFI_PEI_SERVICES**)PeiServices).PciCfg = &gPciCfg2Ppi;
}
if (!FeaturePcdGet (PcdPciCfgDisable)) {
- Status = (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **)PeiServices, &gPciCfgPpiList);
+ Status = (**PeiServices).InstallPpi (PeiServices, &gPciCfgPpiList);
}
if (!FeaturePcdGet (PcdPciCfg2Disable)) {
- Status = (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **)PeiServices, &gPciCfg2PpiList);
+ Status = (**PeiServices).InstallPpi (PeiServices, &gPciCfg2PpiList);
}
return Status;
diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c index 5b4553d..07b6b1a 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c +++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c @@ -98,16 +98,16 @@ ReportDispatcher ( Initialize PEI status codes and publish the status code
PPI.
- @param FfsHeader FV this PEIM was loaded from.
- @param PeiServices General purpose services available to every PEIM.
+ @param FileHandle Handle of the file being invoked.
+ @param PeiServices Describes the list of possible PEI Services.
@return The function always returns success.
**/
EFI_STATUS
PeiStatusCodeDriverEntry (
- IN EFI_FFS_FILE_HEADER *FfsHeader,
- IN EFI_PEI_SERVICES **PeiServices
+ IN EFI_PEI_FILE_HANDLE FileHandle,
+ IN CONST EFI_PEI_SERVICES **PeiServices
)
{
EFI_STATUS Status;
diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c index 0abbb9e..33363e6 100644 --- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c +++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c @@ -47,8 +47,8 @@ EFI_GUID mEfiVariableIndexTableGuid = EFI_VARIABLE_INDEX_TABLE_GUID; /**
Provide the functionality of the variable services.
- @param FfsHeadher - The FFS file header
- @param PeiServices - General purpose services available to every PEIM.
+ @param FileHandle Handle of the file being invoked.
+ @param PeiServices Describes the list of possible PEI Services.
@return Status - EFI_SUCCESS if the interface could be successfully
installed
@@ -57,14 +57,14 @@ EFI_GUID mEfiVariableIndexTableGuid = EFI_VARIABLE_INDEX_TABLE_GUID; EFI_STATUS
EFIAPI
PeimInitializeVariableServices (
- IN EFI_FFS_FILE_HEADER *FfsHeader,
- IN EFI_PEI_SERVICES **PeiServices
+ IN EFI_PEI_FILE_HANDLE FileHandle,
+ IN CONST EFI_PEI_SERVICES **PeiServices
)
{
//
// Publish the variable capability to other modules
//
- return (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **) PeiServices, &mPpiListVariable[0]);
+ return (**PeiServices).InstallPpi (PeiServices, &mPpiListVariable[0]);
}
diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h index 389ee6d..cc5e603 100644 --- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h +++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h @@ -59,12 +59,6 @@ typedef struct { //
// Functions
//
-EFI_STATUS
-EFIAPI
-PeimInitializeVariableServices (
- IN EFI_FFS_FILE_HEADER *FfsHeader,
- IN EFI_PEI_SERVICES **PeiServices
- );
EFI_STATUS
EFIAPI
diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c index c9615a0..b6fff54 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c +++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c @@ -65,8 +65,8 @@ EFI_PEI_PPI_DESCRIPTOR mPpiPCD = { This routine initialize the PCD database for PEI phase and install PCD_PPI.
- @param FfsHeader Pointer to PEIM FFS header image
- @param PeiServices Pointer to EFI_PEI_SERVICES
+ @param FileHandle Handle of the file being invoked.
+ @param PeiServices Describes the list of possible PEI Services.
@return Status of install PCD_PPI
@@ -74,8 +74,8 @@ EFI_PEI_PPI_DESCRIPTOR mPpiPCD = { EFI_STATUS
EFIAPI
PcdPeimInit (
- IN EFI_FFS_FILE_HEADER *FfsHeader,
- IN EFI_PEI_SERVICES **PeiServices
+ IN EFI_PEI_FILE_HANDLE FileHandle,
+ IN CONST EFI_PEI_SERVICES **PeiServices
)
{
BuildPcdDatabase ();
diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c index b3adf72..722c800 100644 --- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c +++ b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c @@ -355,15 +355,15 @@ PciCfg2Modify ( EFI_STATUS
EFIAPI
PeimInitializePciCfg (
- IN EFI_FFS_FILE_HEADER *FfsHeader,
- IN EFI_PEI_SERVICES **PeiServices
+ IN EFI_PEI_FILE_HANDLE FileHandle,
+ IN CONST EFI_PEI_SERVICES **PeiServices
)
{
EFI_STATUS Status;
ASSERT ((**PeiServices).Hdr.Revision >= PEI_SERVICES_REVISION);
- (**PeiServices).PciCfg = &gPciCfg2Ppi;
+ (**(EFI_PEI_SERVICES **)PeiServices).PciCfg = &gPciCfg2Ppi;
Status = (**PeiServices).InstallPpi ((CONST EFI_PEI_SERVICES **)PeiServices, &gPciCfg2PpiList);
return Status;
|