From 1c280088ec83160a5f190b3d0ba796b224ee23b3 Mon Sep 17 00:00:00 2001 From: qwang12 Date: Tue, 4 Sep 2007 06:11:47 +0000 Subject: Merge the PI enabling works from the branch First round of PI enabling work: 1) PiPeiCis changes (CONST, EFI_PEI_FILE_HANDLE.. etc) 2) Make use of FirmwareVolume 2 protocol. 3) Verified for Nt32Pkg and real platform for S3. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3772 6f19259b-4bc3-4df7-8a09-765794883524 --- .../DxeDebugLibSerialPort.inf | 6 +- MdePkg/Library/DxePiLib/DxePiLib.c | 256 +++++++++++++++++++++ MdePkg/Library/DxePiLib/DxePiLib.inf | 46 ++++ .../PeiMemoryAllocationLib/MemoryAllocationLib.c | 10 +- .../PeiMemoryAllocationLib.inf | 1 + MdePkg/Library/PeiPcdLib/PeiPcdLib.c | 16 +- MdePkg/Library/PeiPcdLib/PeiPcdLib.inf | 1 + MdePkg/Library/PeiServicesLib/PeiServicesLib.c | 80 +++---- .../PeiSmbusLibSmbus2Ppi/InternalSmbusLib.h | 5 +- MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.c | 8 +- .../PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf | 1 + .../UefiDebugLibConOut/UefiDebugLibConOut.inf | 9 +- .../UefiDebugLibStdErr/UefiDebugLibStdErr.inf | 8 +- MdePkg/Library/UefiLib/UefiLib.c | 1 + MdePkg/Library/UefiLib/UefiLib.inf | 3 +- MdePkg/Library/UefiLib/UefiLibInternal.h | 4 + 16 files changed, 370 insertions(+), 85 deletions(-) create mode 100644 MdePkg/Library/DxePiLib/DxePiLib.c create mode 100644 MdePkg/Library/DxePiLib/DxePiLib.inf (limited to 'MdePkg/Library') diff --git a/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf b/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf index b9d40dc03e..a4d6f2b23a 100644 --- a/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf +++ b/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf @@ -41,10 +41,8 @@ PrintLib BaseLib -[FixedPcd.common] - gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue - gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask - [Pcd.common] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel + gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask diff --git a/MdePkg/Library/DxePiLib/DxePiLib.c b/MdePkg/Library/DxePiLib/DxePiLib.c new file mode 100644 index 0000000000..3261e08ade --- /dev/null +++ b/MdePkg/Library/DxePiLib/DxePiLib.c @@ -0,0 +1,256 @@ +/** @file + Mde PI library functions. + + Copyright (c) 2007, Intel Corporation
+ All rights reserved. This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#include +#include +#include +#include +#include +#include + + +/** + Internal function which read the image specified by Firmware File GUID name and + the Firmware Section tyep from a specified Firmware Volume + + + @param Fv The Firmware Volume Protocol instance. + @param NameGuid The GUID name of a Firmware File. + @param SectionType The Firmware Section type. + @param Buffer On output, Buffer contains the the data read from the section in the Firmware File found. + @param Size On output, the size of Buffer. + + @retval EFI_SUCCESS The image is found and data and size is returned. + @retval EFI_NOT_FOUND The image specified by NameGuid and SectionType can't be found. + @retval EFI_OUT_OF_RESOURCES There were not enough resources to allocate the output data buffer or complete the operations. + @retval EFI_DEVICE_ERROR A hardware error occurs during reading from the Firmware Volume. + @retval EFI_ACCESS_DENIED The firmware volume containing the searched Firmware File is configured to disallow reads. + +**/ +STATIC +EFI_STATUS +GetImageFromFv ( + IN EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv, + IN CONST EFI_GUID *NameGuid, + IN EFI_SECTION_TYPE SectionType, + OUT VOID **Buffer, + OUT UINTN *Size + ) +{ + EFI_STATUS Status; + EFI_FV_FILETYPE FileType; + EFI_FV_FILE_ATTRIBUTES Attributes; + UINT32 AuthenticationStatus; + + // + // Read desired section content in NameGuid file + // + *Buffer = NULL; + *Size = 0; + Status = Fv->ReadSection ( + Fv, + NameGuid, + SectionType, + 0, + Buffer, + Size, + &AuthenticationStatus + ); + + if (EFI_ERROR (Status) && (SectionType == EFI_SECTION_TE)) { + // + // Try reading PE32 section, since the TE section does not exist + // + *Buffer = NULL; + *Size = 0; + Status = Fv->ReadSection ( + Fv, + NameGuid, + EFI_SECTION_PE32, + 0, + Buffer, + Size, + &AuthenticationStatus + ); + } + + if (EFI_ERROR (Status) && + ((SectionType == EFI_SECTION_TE) || (SectionType == EFI_SECTION_PE32))) { + // + // Try reading raw file, since the desired section does not exist + // + *Buffer = NULL; + *Size = 0; + Status = Fv->ReadFile ( + Fv, + NameGuid, + Buffer, + Size, + &FileType, + &Attributes, + &AuthenticationStatus + ); + } + + return Status; +} + +/** + Allocate and fill a buffer with an image identified by a Firmware File GUID name and a Firmware Section type. + The Firmware Volumes to search for the Firmware File can be specified to be either all Firmware Volumes + in the system, or the Firmware Volume which contains the Firmware File specified by an image handle. + + If ImageHandle is NULL, all Firmware Volumes in the system will be searched. If ImageHandle is not NULL, + ImageHandle is interpreted as EFI_PEI_FILE_HANDLE for the implementation of this function for PEI phase. + The input parameter ImageHandle is interpreted as EFI_HANDLE, on which an EFI_LOADED_IMAGE_PROTOCOL + is installed, for the implementation of this function for DXE phase. The search always starts from the FV + identified by ImageHandle. If WithinImageFv is TRUE, search will only be performed on the first FV. If WithinImageFv + is FALSE, search will continue on other FVs if it fails on the first FV. The search order of Firmware Volumes is + deterministic but arbitrary if no new firmware volume is added into the system between each search. + + The search order for the section type specified by SectionType in the Firmware File is using a depth-first + and left-to-right algorithm through all sections. The first section found to match SectionType will be returned. + + If SectionType is EFI_SECTION_PE32, EFI_SECTION_PE32 will be used as Firmware Section type + to read Firmware Section data from the Firmware File. If no such section exists, the function will try + to read a Firmware File named with NameGuid. If no such file exists, EFI_NOT_FOUND is returned. + + If SectionType is EFI_SECTION_TE, EFI_SECTION_TE will be used as Firmware Section type to read Firmware Section + data from the Firmware File. If no such section exists, EFI_SECTION_PE32 will be used as Firmware Section type to + read Firmware Section data from the Firmware File. If no such section exists, the function will try to read a Firmware + File named with NameGuid. If no such file exists, EFI_NOT_FOUND is returned. + + The data and size is returned by Buffer and Size. The caller is responsible to free the Buffer allocated + by this function. This function can only be called at TPL_NOTIFY and below. + + If ImageHandle is NULL and WithinImage is TRUE, then ASSERT (); + If NameGuid is NULL, then ASSERT(); + If Buffer is NULL, then ASSERT(); + If Size is NULL, then ASSERT(). + + @param NameGuid The GUID name of a Firmware File. + @param SectionType The Firmware Section type. + @param Buffer On output, Buffer contains the the data read from the section in the Firmware File found. + @param Size On output, the size of Buffer. + + @retval EFI_SUCCESS The image is found and data and size is returned. + @retval EFI_NOT_FOUND The image specified by NameGuid and SectionType can't be found. + @retval EFI_OUT_OF_RESOURCES There were not enough resources to allocate the output data buffer or complete the operations. + @retval EFI_DEVICE_ERROR A hardware error occurs during reading from the Firmware Volume. + @retval EFI_ACCESS_DENIED The firmware volume containing the searched Firmware File is configured to disallow reads. + +**/ + +EFI_STATUS +EFIAPI +GetSectionFromFvFile ( + IN CONST VOID *ImageHandle, + IN CONST EFI_GUID *NameGuid, + IN EFI_SECTION_TYPE SectionType, + OUT VOID **Buffer, + OUT UINTN *Size, + IN BOOLEAN WithinImageFv + ) +{ + EFI_STATUS Status; + EFI_HANDLE *HandleBuffer; + UINTN HandleCount; + UINTN Index; + EFI_LOADED_IMAGE_PROTOCOL *LoadedImage; + EFI_FIRMWARE_VOLUME2_PROTOCOL *ImageFv; + EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv; + + ASSERT (NameGuid != NULL); + ASSERT (Buffer != NULL); + ASSERT (Size != NULL); + ASSERT (!(ImageHandle == NULL && WithinImageFv)); + + Status = EFI_NOT_FOUND; + ImageFv = NULL; + if (ImageHandle != NULL) { + Status = gBS->HandleProtocol ( + (EFI_HANDLE *) ImageHandle, + &gEfiLoadedImageProtocolGuid, + (VOID **) &LoadedImage + ); + if (EFI_ERROR (Status)) { + return Status; + } + Status = gBS->HandleProtocol ( + LoadedImage->DeviceHandle, + &gEfiFirmwareVolume2ProtocolGuid, + (VOID **) &ImageFv + ); + if (!EFI_ERROR (Status)) { + Status = GetImageFromFv (ImageFv, NameGuid, SectionType, Buffer, Size); + } + } + + if (Status == EFI_SUCCESS || WithinImageFv) { + return Status; + } + + HandleBuffer = NULL; + Status = gBS->LocateHandleBuffer ( + ByProtocol, + &gEfiFirmwareVolume2ProtocolGuid, + NULL, + &HandleCount, + &HandleBuffer + ); + if (EFI_ERROR (Status)) { + goto Done; + } + + // + // Find desired image in all Fvs + // + for (Index = 0; Index < HandleCount; ++Index) { + Status = gBS->HandleProtocol ( + HandleBuffer[Index], + &gEfiFirmwareVolume2ProtocolGuid, + (VOID**)&Fv + ); + + if (EFI_ERROR (Status)) { + goto Done; + } + + if (ImageFv != NULL && Fv == ImageFv) { + continue; + } + + Status = GetImageFromFv (Fv, NameGuid, SectionType, Buffer, Size); + + if (!EFI_ERROR (Status)) { + goto Done; + } + } + + // + // Not found image + // + if (Index == HandleCount) { + Status = EFI_NOT_FOUND; + } + +Done: + + if (HandleBuffer != NULL) { + FreePool(HandleBuffer); + } + + return Status; +} + diff --git a/MdePkg/Library/DxePiLib/DxePiLib.inf b/MdePkg/Library/DxePiLib/DxePiLib.inf new file mode 100644 index 0000000000..e459e046a1 --- /dev/null +++ b/MdePkg/Library/DxePiLib/DxePiLib.inf @@ -0,0 +1,46 @@ +#/** @file +# Component description file library instance for PiLib for DXE phase. +# +# Library to abstract utility functions that is related to PI Specification. +# +# Copyright (c) 2007, Intel Corporation. +# +# All rights reserved. This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# +# +#**/ + +[Defines] + INF_VERSION = 0x00010005 + BASE_NAME = DxePiLib + FILE_GUID = EE680C58-FFC0-4a5d-858F-66FF9C84BC9F + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + LIBRARY_CLASS = PiLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER + EDK_RELEASE_VERSION = 0x00020000 + EFI_SPECIFICATION_VERSION = 0x00020000 + + +# +# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# + +[Sources.common] + DxePiLib.c + +[Packages] + MdePkg/MdePkg.dec + + +[LibraryClasses] + MemoryAllocationLib + DebugLib + +[Protocols] + gEfiFirmwareVolume2ProtocolGuid # ALWAYS_CONSUMED + diff --git a/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c b/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c index 57a4009461..b1f6157bf5 100644 --- a/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c +++ b/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -44,14 +45,12 @@ InternalAllocatePages ( { EFI_STATUS Status; EFI_PHYSICAL_ADDRESS Memory; - EFI_PEI_SERVICES **PeiServices; if (Pages == 0) { return NULL; } - PeiServices = GetPeiServicesTablePointer (); - Status = (*PeiServices)->AllocatePages (PeiServices, MemoryType, Pages, &Memory); + Status = PeiServicesAllocatePages (MemoryType, Pages, &Memory); if (EFI_ERROR (Status)) { Memory = 0; } @@ -353,12 +352,9 @@ AllocatePool ( ) { EFI_STATUS Status; - EFI_PEI_SERVICES **PeiServices; VOID *Buffer; - PeiServices = GetPeiServicesTablePointer (); - - Status = (*PeiServices)->AllocatePool (PeiServices, AllocationSize, &Buffer); + Status = PeiServicesAllocatePool (AllocationSize, &Buffer); if (EFI_ERROR (Status)) { Buffer = NULL; } diff --git a/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf b/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf index 3a867a3345..6001d6a5f5 100644 --- a/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf +++ b/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf @@ -43,4 +43,5 @@ DebugLib BaseMemoryLib PeiServicesTablePointerLib + PeiServicesLib diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c index 4e66531979..ea65581ebc 100644 --- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c +++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c @@ -20,6 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include +#include #include #include #include @@ -41,19 +42,8 @@ GetPcdPpiPtr ( { EFI_STATUS Status; PCD_PPI *PcdPpi; - EFI_PEI_SERVICES **PeiServices; - - - PeiServices = GetPeiServicesTablePointer (); - - Status = (**PeiServices).LocatePpi ( - PeiServices, - &gPcdPpiGuid, - 0, - NULL, - (VOID **)&PcdPpi - ); - + + Status = PeiServicesLocatePpi (&gPcdPpiGuid, 0, NULL, (VOID **)&PcdPpi); ASSERT_EFI_ERROR (Status); return PcdPpi; diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf b/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf index dc9ca4c169..f48f929a44 100644 --- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf +++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf @@ -42,6 +42,7 @@ [LibraryClasses] BaseMemoryLib PeiServicesTablePointerLib + PeiServicesLib DebugLib diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.c b/MdePkg/Library/PeiServicesLib/PeiServicesLib.c index cdcb857185..c5b12be721 100644 --- a/MdePkg/Library/PeiServicesLib/PeiServicesLib.c +++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.c @@ -34,12 +34,12 @@ EFI_STATUS EFIAPI PeiServicesInstallPpi ( - IN EFI_PEI_PPI_DESCRIPTOR *PpiList + IN CONST EFI_PEI_PPI_DESCRIPTOR *PpiList ) { - EFI_PEI_SERVICES **PeiServices; + CONST EFI_PEI_SERVICES **PeiServices; - PeiServices = GetPeiServicesTablePointer (); + PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer (); return (*PeiServices)->InstallPpi (PeiServices, PpiList); } @@ -61,13 +61,13 @@ PeiServicesInstallPpi ( EFI_STATUS EFIAPI PeiServicesReInstallPpi ( - IN EFI_PEI_PPI_DESCRIPTOR *OldPpi, - IN EFI_PEI_PPI_DESCRIPTOR *NewPpi + IN CONST EFI_PEI_PPI_DESCRIPTOR *OldPpi, + IN CONST EFI_PEI_PPI_DESCRIPTOR *NewPpi ) { - EFI_PEI_SERVICES **PeiServices; + CONST EFI_PEI_SERVICES **PeiServices; - PeiServices = GetPeiServicesTablePointer (); + PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer (); return (*PeiServices)->ReInstallPpi (PeiServices, OldPpi, NewPpi); } @@ -87,15 +87,15 @@ PeiServicesReInstallPpi ( EFI_STATUS EFIAPI PeiServicesLocatePpi ( - IN EFI_GUID *Guid, + IN CONST EFI_GUID *Guid, IN UINTN Instance, IN OUT EFI_PEI_PPI_DESCRIPTOR **PpiDescriptor, IN OUT VOID **Ppi ) { - EFI_PEI_SERVICES **PeiServices; + CONST EFI_PEI_SERVICES **PeiServices; - PeiServices = GetPeiServicesTablePointer (); + PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer (); return (*PeiServices)->LocatePpi (PeiServices, Guid, Instance, PpiDescriptor, Ppi); } @@ -116,12 +116,12 @@ PeiServicesLocatePpi ( EFI_STATUS EFIAPI PeiServicesNotifyPpi ( - IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyList + IN CONST EFI_PEI_NOTIFY_DESCRIPTOR *NotifyList ) { - EFI_PEI_SERVICES **PeiServices; + CONST EFI_PEI_SERVICES **PeiServices; - PeiServices = GetPeiServicesTablePointer (); + PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer (); return (*PeiServices)->NotifyPpi (PeiServices, NotifyList); } @@ -140,9 +140,9 @@ PeiServicesGetBootMode ( IN OUT EFI_BOOT_MODE *BootMode ) { - EFI_PEI_SERVICES **PeiServices; + CONST EFI_PEI_SERVICES **PeiServices; - PeiServices = GetPeiServicesTablePointer (); + PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer (); return (*PeiServices)->GetBootMode (PeiServices, BootMode); } @@ -160,9 +160,9 @@ PeiServicesSetBootMode ( IN EFI_BOOT_MODE BootMode ) { - EFI_PEI_SERVICES **PeiServices; + CONST EFI_PEI_SERVICES **PeiServices; - PeiServices = GetPeiServicesTablePointer (); + PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer (); return (*PeiServices)->SetBootMode (PeiServices, BootMode); } @@ -181,9 +181,9 @@ PeiServicesGetHobList ( IN OUT VOID **HobList ) { - EFI_PEI_SERVICES **PeiServices; + CONST EFI_PEI_SERVICES **PeiServices; - PeiServices = GetPeiServicesTablePointer (); + PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer (); return (*PeiServices)->GetHobList (PeiServices, HobList); } @@ -206,9 +206,9 @@ PeiServicesCreateHob ( IN OUT VOID **Hob ) { - EFI_PEI_SERVICES **PeiServices; + CONST EFI_PEI_SERVICES **PeiServices; - PeiServices = GetPeiServicesTablePointer (); + PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer (); return (*PeiServices)->CreateHob (PeiServices, Type, Length, Hob); } @@ -228,13 +228,13 @@ EFI_STATUS EFIAPI PeiServicesFfsFindNextVolume ( IN UINTN Instance, - IN OUT EFI_FIRMWARE_VOLUME_HEADER **FwVolHeader + IN OUT EFI_PEI_FV_HANDLE *VolumeHandle ) { - EFI_PEI_SERVICES **PeiServices; + CONST EFI_PEI_SERVICES **PeiServices; - PeiServices = GetPeiServicesTablePointer (); - return (*PeiServices)->FfsFindNextVolume (PeiServices, Instance, FwVolHeader); + PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer (); + return (*PeiServices)->FfsFindNextVolume (PeiServices, Instance, VolumeHandle); } /** @@ -254,14 +254,14 @@ EFI_STATUS EFIAPI PeiServicesFfsFindNextFile ( IN EFI_FV_FILETYPE SearchType, - IN EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader, - IN OUT EFI_FFS_FILE_HEADER **FileHeader + IN EFI_PEI_FV_HANDLE VolumeHandle, + IN OUT EFI_PEI_FILE_HANDLE *FileHandle ) { - EFI_PEI_SERVICES **PeiServices; + CONST EFI_PEI_SERVICES **PeiServices; - PeiServices = GetPeiServicesTablePointer (); - return (*PeiServices)->FfsFindNextFile (PeiServices, SearchType, FwVolHeader, FileHeader); + PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer (); + return (*PeiServices)->FfsFindNextFile (PeiServices, SearchType, VolumeHandle, FileHandle); } /** @@ -280,13 +280,13 @@ EFI_STATUS EFIAPI PeiServicesFfsFindSectionData ( IN EFI_SECTION_TYPE SectionType, - IN EFI_FFS_FILE_HEADER *FfsFileHeader, + IN EFI_PEI_FILE_HANDLE FfsFileHeader, IN OUT VOID **SectionData ) { - EFI_PEI_SERVICES **PeiServices; + CONST EFI_PEI_SERVICES **PeiServices; - PeiServices = GetPeiServicesTablePointer (); + PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer (); return (*PeiServices)->FfsFindSectionData (PeiServices, SectionType, FfsFileHeader, SectionData); } @@ -309,9 +309,9 @@ PeiServicesInstallPeiMemory ( IN UINT64 MemoryLength ) { - EFI_PEI_SERVICES **PeiServices; + CONST EFI_PEI_SERVICES **PeiServices; - PeiServices = GetPeiServicesTablePointer (); + PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer (); return (*PeiServices)->InstallPeiMemory (PeiServices, MemoryBegin, MemoryLength); } @@ -337,9 +337,9 @@ PeiServicesAllocatePages ( IN OUT EFI_PHYSICAL_ADDRESS *Memory ) { - EFI_PEI_SERVICES **PeiServices; + CONST EFI_PEI_SERVICES **PeiServices; - PeiServices = GetPeiServicesTablePointer (); + PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer (); return (*PeiServices)->AllocatePages (PeiServices, MemoryType, Pages, Memory); } @@ -361,9 +361,9 @@ PeiServicesAllocatePool ( OUT VOID **Buffer ) { - EFI_PEI_SERVICES **PeiServices; + CONST EFI_PEI_SERVICES **PeiServices; - PeiServices = GetPeiServicesTablePointer (); + PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer (); return (*PeiServices)->AllocatePool (PeiServices, Size, Buffer); } @@ -380,7 +380,7 @@ PeiServicesResetSystem ( VOID ) { - EFI_PEI_SERVICES **PeiServices; + EFI_PEI_SERVICES **PeiServices; PeiServices = GetPeiServicesTablePointer (); return (*PeiServices)->ResetSystem (PeiServices); diff --git a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/InternalSmbusLib.h b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/InternalSmbusLib.h index 81104db727..acd7ab7a25 100644 --- a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/InternalSmbusLib.h +++ b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/InternalSmbusLib.h @@ -24,6 +24,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include +#include #include #define SMBUS_LIB_SLAVE_ADDRESS(SmBusAddress) (((SmBusAddress) >> 1) & 0x7f) @@ -41,14 +42,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. This internal function retrieves Smbus PPI from PPI database. - @param PeiServices An indirect pointer to the EFI_PEI_SERVICES published by the PEI Foundation. + @param VOID @return The pointer to Smbus PPI. **/ EFI_PEI_SMBUS2_PPI * InternalGetSmbusPpi ( - EFI_PEI_SERVICES **PeiServices + VOID ); /** diff --git a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.c b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.c index 103e5ed5c6..d78682a694 100644 --- a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.c +++ b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLib.c @@ -26,13 +26,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ EFI_PEI_SMBUS2_PPI * InternalGetSmbusPpi ( - EFI_PEI_SERVICES **PeiServices + VOID ) { EFI_STATUS Status; EFI_PEI_SMBUS2_PPI *SmbusPpi; - Status = (*PeiServices)->LocatePpi (PeiServices, &gEfiPeiSmbus2PpiGuid, 0, NULL, (VOID **) &SmbusPpi); + Status = PeiServicesLocatePpi (&gEfiPeiSmbus2PpiGuid, 0, NULL, (VOID **) &SmbusPpi); ASSERT_EFI_ERROR (Status); ASSERT (SmbusPpi != NULL); @@ -70,12 +70,10 @@ InternalSmBusExec ( ) { EFI_PEI_SMBUS2_PPI *SmbusPpi; - EFI_PEI_SERVICES **PeiServices; RETURN_STATUS ReturnStatus; EFI_SMBUS_DEVICE_ADDRESS SmbusDeviceAddress; - PeiServices = GetPeiServicesTablePointer (); - SmbusPpi = InternalGetSmbusPpi (PeiServices); + SmbusPpi = InternalGetSmbusPpi (); SmbusDeviceAddress.SmbusDeviceAddress = SMBUS_LIB_SLAVE_ADDRESS (SmBusAddress); ReturnStatus = SmbusPpi->Execute ( diff --git a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf index 1e0a9f225e..05a6ae2315 100644 --- a/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf +++ b/MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf @@ -42,6 +42,7 @@ [LibraryClasses] BaseMemoryLib PeiServicesTablePointerLib + PeiServicesLib DebugLib [Ppis] diff --git a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf index 074ba24519..0a51c142c4 100644 --- a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf +++ b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf @@ -46,13 +46,8 @@ PrintLib UefiBootServicesTableLib - - -[FixedPcd.common] - gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue - gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask - - [Pcd.common] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel + gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask diff --git a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf index 67aeb066b6..de03bc64c6 100644 --- a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf +++ b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf @@ -44,12 +44,8 @@ PrintLib UefiBootServicesTableLib - -[FixedPcd.common] - gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue - gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask - - [Pcd.common] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel + gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask diff --git a/MdePkg/Library/UefiLib/UefiLib.c b/MdePkg/Library/UefiLib/UefiLib.c index 28f5c7d883..12a717aa27 100644 --- a/MdePkg/Library/UefiLib/UefiLib.c +++ b/MdePkg/Library/UefiLib/UefiLib.c @@ -1209,3 +1209,4 @@ FreeUnicodeStringTable ( return EFI_SUCCESS; } + diff --git a/MdePkg/Library/UefiLib/UefiLib.inf b/MdePkg/Library/UefiLib/UefiLib.inf index eac192817c..7aa1812d0b 100644 --- a/MdePkg/Library/UefiLib/UefiLib.inf +++ b/MdePkg/Library/UefiLib/UefiLib.inf @@ -67,9 +67,10 @@ gEfiDriverConfigurationProtocolGuid # SOMETIMES_CONSUMED gEfiDriverDiagnosticsProtocolGuid # SOMETIMES_CONSUMED gEfiDriverDiagnostics2ProtocolGuid # SOMETIMES_CONSUMED + gEfiFirmwareVolume2ProtocolGuid # ALWAYS_CONSUMED -[FixedPcd.common] +[Pcd.common] gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize [FeaturePcd.common] diff --git a/MdePkg/Library/UefiLib/UefiLibInternal.h b/MdePkg/Library/UefiLib/UefiLibInternal.h index 82ba4c439e..b21e5d1559 100644 --- a/MdePkg/Library/UefiLib/UefiLibInternal.h +++ b/MdePkg/Library/UefiLib/UefiLibInternal.h @@ -21,6 +21,9 @@ #include #include #include +#include +#include + #include #include #include @@ -32,4 +35,5 @@ #include #include + #endif -- cgit v1.2.3