EFI_STATUS\r
EFIAPI\r
PeiServicesInstallPpi (\r
- IN EFI_PEI_PPI_DESCRIPTOR *PpiList\r
+ IN CONST EFI_PEI_PPI_DESCRIPTOR *PpiList\r
);\r
\r
/**\r
EFI_STATUS\r
EFIAPI\r
PeiServicesReInstallPpi (\r
- IN EFI_PEI_PPI_DESCRIPTOR *OldPpi,\r
- IN EFI_PEI_PPI_DESCRIPTOR *NewPpi\r
+ IN CONST EFI_PEI_PPI_DESCRIPTOR *OldPpi,\r
+ IN CONST EFI_PEI_PPI_DESCRIPTOR *NewPpi\r
);\r
\r
/**\r
EFI_STATUS\r
EFIAPI\r
PeiServicesLocatePpi (\r
- IN EFI_GUID *Guid,\r
+ IN CONST EFI_GUID *Guid,\r
IN UINTN Instance,\r
IN OUT EFI_PEI_PPI_DESCRIPTOR **PpiDescriptor,\r
IN OUT VOID **Ppi\r
EFI_STATUS\r
EFIAPI\r
PeiServicesNotifyPpi (\r
- IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyList\r
+ IN CONST EFI_PEI_NOTIFY_DESCRIPTOR *NotifyList\r
);\r
\r
/**\r
EFIAPI\r
PeiServicesFfsFindNextVolume (\r
IN UINTN Instance,\r
- IN OUT EFI_FIRMWARE_VOLUME_HEADER **FwVolHeader\r
+ IN OUT EFI_PEI_FV_HANDLE *VolumeHandle\r
);\r
\r
/**\r
EFIAPI\r
PeiServicesFfsFindNextFile (\r
IN EFI_FV_FILETYPE SearchType,\r
- IN EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader,\r
- IN OUT EFI_FFS_FILE_HEADER **FileHeader\r
+ IN EFI_PEI_FV_HANDLE VolumeHandle,\r
+ IN OUT EFI_PEI_FILE_HANDLE *FileHandle\r
);\r
\r
/**\r
EFIAPI\r
PeiServicesFfsFindSectionData (\r
IN EFI_SECTION_TYPE SectionType,\r
- IN EFI_FFS_FILE_HEADER *FfsFileHeader,\r
+ IN EFI_PEI_FILE_HANDLE FileHandle,\r
IN OUT VOID **SectionData\r
);\r
\r
--- /dev/null
+/** @file\r
+ MDE PI library functions and macros\r
+\r
+ Copyright (c) 2007, Intel Corporation \r
+ All rights reserved. This program and the accompanying materials \r
+ are licensed and made available under the terms and conditions of the BSD License \r
+ which accompanies this distribution. The full text of the license may be found at \r
+ http://opensource.org/licenses/bsd-license.php \r
+\r
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, \r
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. \r
+\r
+**/\r
+\r
+#ifndef __PI_LIB_H__\r
+#define __PI_LIB_H__\r
+\r
+#include <Pi/PiFirmwareFile.h>\r
+\r
+/**\r
+ Allocate and fill a buffer with an image identified by a Firmware File GUID name and a Firmware Section type. \r
+ The Firmware Volumes to search for the Firmware File can be specified to be either all Firmware Volumes \r
+ in the system, or the Firmware Volume which contains the Firmware File specified by an image handle.\r
+\r
+ If ImageHandle is NULL, all Firmware Volumes in the system will be searched. If ImageHandle is not NULL, \r
+ ImageHandle is interpreted as EFI_PEI_FILE_HANDLE for the implementation of this function for PEI phase. \r
+ The input parameter ImageHandle is interpreted as EFI_HANDLE, on which an EFI_LOADED_IMAGE_PROTOCOL \r
+ is installed, for the implementation of this function for DXE phase. The search always starts from the FV \r
+ identified by ImageHandle. If WithinImageFv is TRUE, search will only be performed on the first FV. If WithinImageFv \r
+ is FALSE, search will continue on other FVs if it fails on the first FV. The search order of Firmware Volumes is \r
+ deterministic but arbitrary if no new firmware volume is added into the system between each search. \r
+ \r
+ The search order for the section type specified by SectionType in the Firmware File is using a depth-first \r
+ and left-to-right algorithm through all sections. The first section found to match SectionType will be returned. \r
+ \r
+ If SectionType is EFI_SECTION_PE32, EFI_SECTION_PE32 will be used as Firmware Section type \r
+ to read Firmware Section data from the Firmware File. If no such section exists, the function will try \r
+ to read a Firmware File named with NameGuid. If no such file exists, EFI_NOT_FOUND is returned.\r
+ \r
+ If SectionType is EFI_SECTION_TE, EFI_SECTION_TE will be used as Firmware Section type to read Firmware Section \r
+ data from the Firmware File. If no such section exists, EFI_SECTION_PE32 will be used as Firmware Section type to \r
+ read Firmware Section data from the Firmware File. If no such section exists, the function will try to read a Firmware \r
+ File named with NameGuid. If no such file exists, EFI_NOT_FOUND is returned.\r
+ \r
+ The data and size is returned by Buffer and Size. The caller is responsible to free the Buffer allocated \r
+ by this function. This function can only be called at TPL_NOTIFY and below.\r
+ \r
+ If ImageHandle is NULL and WithinImage is TRUE, then ASSERT ();\r
+ If NameGuid is NULL, then ASSERT();\r
+ If Buffer is NULL, then ASSERT();\r
+ If Size is NULL, then ASSERT().\r
+\r
+ @param NameGuid The GUID name of a Firmware File.\r
+ @param SectionType The Firmware Section type.\r
+ @param Buffer On output, Buffer contains the the data read from the section in the Firmware File found.\r
+ @param Size On output, the size of Buffer.\r
+\r
+ @retval EFI_SUCCESS The image is found and data and size is returned.\r
+ @retval EFI_NOT_FOUND The image specified by NameGuid and SectionType can't be found.\r
+ @retval EFI_OUT_OF_RESOURCES There were not enough resources to allocate the output data buffer or complete the operations.\r
+ @retval EFI_DEVICE_ERROR A hardware error occurs during reading from the Firmware Volume.\r
+ @retval EFI_ACCESS_DENIED The firmware volume containing the searched Firmware File is configured to disallow reads.\r
+\r
+**/\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+GetSectionFromFvFile (\r
+ IN CONST VOID* ImageHandle OPTIONAL,\r
+ IN CONST EFI_GUID *NameGuid,\r
+ IN EFI_SECTION_TYPE SectionType,\r
+ OUT VOID **Buffer,\r
+ OUT UINTN *Size,\r
+ IN BOOLEAN WithImageFv\r
+ )\r
+;\r
+\r
+\r
+#endif\r
+\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_INSTALL_PPI) (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_PEI_PPI_DESCRIPTOR *PpiList\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN CONST EFI_PEI_PPI_DESCRIPTOR *PpiList\r
);\r
\r
/**\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_REINSTALL_PPI) (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_PEI_PPI_DESCRIPTOR *OldPpi,\r
- IN EFI_PEI_PPI_DESCRIPTOR *NewPpi\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN CONST EFI_PEI_PPI_DESCRIPTOR *OldPpi,\r
+ IN CONST EFI_PEI_PPI_DESCRIPTOR *NewPpi\r
);\r
\r
/**\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_LOCATE_PPI) (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_GUID *Guid,\r
- IN UINTN Instance,\r
- IN OUT EFI_PEI_PPI_DESCRIPTOR **PpiDescriptor,\r
- IN OUT VOID **Ppi\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN CONST EFI_GUID *Guid,\r
+ IN UINTN Instance,\r
+ IN OUT EFI_PEI_PPI_DESCRIPTOR **PpiDescriptor OPTIONAL,\r
+ IN OUT VOID **Ppi\r
);\r
\r
/**\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_NOTIFY_PPI) (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyList\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN CONST EFI_PEI_NOTIFY_DESCRIPTOR *NotifyList\r
);\r
\r
/**\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_GET_BOOT_MODE) (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- OUT EFI_BOOT_MODE *BootMode\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ OUT EFI_BOOT_MODE *BootMode\r
);\r
\r
/**\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_SET_BOOT_MODE) (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_BOOT_MODE BootMode\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_BOOT_MODE BootMode\r
);\r
\r
/**\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_GET_HOB_LIST) (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN OUT VOID **HobList\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN OUT VOID **HobList\r
);\r
\r
/**\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_CREATE_HOB) (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN UINT16 Type,\r
- IN UINT16 Length,\r
- IN OUT VOID **Hob\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN UINT16 Type,\r
+ IN UINT16 Length,\r
+ IN OUT VOID **Hob\r
);\r
\r
/**\r
\r
@param PeiServices An indirect pointer to the EFI_PEI_SERVICES table published by the PEI Foundation.\r
@param Instance This instance of the firmware volume to find. The value 0 is the Boot Firmware Volume (BFV).\r
- @param FwVolHeader Pointer to the firmware volume header of the volume to return.\r
+ @param VolumeHandle On exit, points to the next volumn handle or NULL if it does not exist.\r
\r
@retval EFI_SUCCESS The volume was found.\r
@retval EFI_NOT_FOUND The volume was not found.\r
- @retval EFI_INVALID_PARAMETER FwVolHeader is NULL\r
+ @retval EFI_INVALID_PARAMETER VolHandle is NULL\r
\r
**/\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_FFS_FIND_NEXT_VOLUME2) (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN UINTN Instance,\r
- IN OUT EFI_FIRMWARE_VOLUME_HEADER **FwVolHeader\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN UINTN Instance,\r
+ OUT EFI_PEI_FV_HANDLE *VolumeHandle\r
);\r
\r
/**\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_FFS_FIND_NEXT_FILE2) (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_FV_FILETYPE SearchType,\r
- IN EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader,\r
- IN OUT EFI_FFS_FILE_HEADER **FileHeader\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_FV_FILETYPE SearchType,\r
+ IN EFI_PEI_FV_HANDLE VolumeHandle,\r
+ IN OUT EFI_PEI_FILE_HANDLE *FileHandle\r
);\r
\r
/**\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_FFS_FIND_SECTION_DATA2) (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_SECTION_TYPE SectionType,\r
- IN EFI_FFS_FILE_HEADER *FfsFileHeader,\r
- IN OUT VOID **SectionData\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_SECTION_TYPE SectionType,\r
+ IN EFI_PEI_FILE_HANDLE FileHandle,\r
+ IN OUT VOID **SectionData\r
);\r
\r
/**\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_INSTALL_PEI_MEMORY) (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
IN EFI_PHYSICAL_ADDRESS MemoryBegin,\r
IN UINT64 MemoryLength\r
);\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_ALLOCATE_PAGES) (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
IN EFI_MEMORY_TYPE MemoryType,\r
IN UINTN Pages,\r
IN OUT EFI_PHYSICAL_ADDRESS *Memory\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_ALLOCATE_POOL) (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
IN UINTN Size,\r
OUT VOID **Buffer\r
);\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_REPORT_STATUS_CODE) (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_STATUS_CODE_TYPE Type,\r
- IN EFI_STATUS_CODE_VALUE Value,\r
- IN UINT32 Instance,\r
- IN EFI_GUID *CallerId OPTIONAL,\r
- IN EFI_STATUS_CODE_DATA *Data OPTIONAL\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_STATUS_CODE_TYPE Type,\r
+ IN EFI_STATUS_CODE_VALUE Value,\r
+ IN UINT32 Instance,\r
+ IN CONST EFI_GUID *CallerId OPTIONAL,\r
+ IN CONST EFI_STATUS_CODE_DATA *Data OPTIONAL\r
);\r
\r
/**\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_FFS_GET_FILE_INFO) (\r
IN CONST EFI_PEI_FILE_HANDLE FileHandle,\r
- OUT EFI_FV_FILE_INFO *FileInfo\r
+ OUT EFI_FV_FILE_INFO *FileInfo\r
);\r
\r
\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_FFS_GET_VOLUME_INFO) (\r
- IN CONST EFI_PEI_FV_HANDLE *VolumeHandle,\r
- OUT EFI_FV_INFO *VolumeInfo\r
+ IN EFI_PEI_FV_HANDLE VolumeHandle,\r
+ OUT EFI_FV_INFO *VolumeInfo\r
);\r
\r
/**\r
typedef\r
EFI_STATUS\r
(EFIAPI *EFI_PEI_REGISTER_FOR_SHADOW) (\r
- IN CONST EFI_PEI_FILE_HANDLE FileHandle\r
+ IN EFI_PEI_FILE_HANDLE FileHandle\r
);\r
\r
\r
PrintLib\r
BaseLib\r
\r
-[FixedPcd.common]\r
- gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue\r
- gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask\r
-\r
[Pcd.common]\r
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel\r
+ gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue\r
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask\r
\r
--- /dev/null
+/** @file\r
+ Mde PI library functions.\r
+\r
+ Copyright (c) 2007, Intel Corporation<BR>\r
+ All rights reserved. This program and the accompanying materials\r
+ are licensed and made available under the terms and conditions of the BSD License\r
+ which accompanies this distribution. The full text of the license may be found at\r
+ http://opensource.org/licenses/bsd-license.php\r
+\r
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+**/\r
+\r
+#include <PiDxe.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Protocol/FirmwareVolume2.h>\r
+#include <Protocol/LoadedImage.h>\r
+\r
+\r
+/**\r
+ Internal function which read the image specified by Firmware File GUID name and \r
+ the Firmware Section tyep from a specified Firmware Volume \r
+\r
+\r
+ @param Fv The Firmware Volume Protocol instance.\r
+ @param NameGuid The GUID name of a Firmware File.\r
+ @param SectionType The Firmware Section type.\r
+ @param Buffer On output, Buffer contains the the data read from the section in the Firmware File found.\r
+ @param Size On output, the size of Buffer.\r
+\r
+ @retval EFI_SUCCESS The image is found and data and size is returned.\r
+ @retval EFI_NOT_FOUND The image specified by NameGuid and SectionType can't be found.\r
+ @retval EFI_OUT_OF_RESOURCES There were not enough resources to allocate the output data buffer or complete the operations.\r
+ @retval EFI_DEVICE_ERROR A hardware error occurs during reading from the Firmware Volume.\r
+ @retval EFI_ACCESS_DENIED The firmware volume containing the searched Firmware File is configured to disallow reads.\r
+\r
+**/\r
+STATIC\r
+EFI_STATUS\r
+GetImageFromFv (\r
+ IN EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv,\r
+ IN CONST EFI_GUID *NameGuid,\r
+ IN EFI_SECTION_TYPE SectionType,\r
+ OUT VOID **Buffer,\r
+ OUT UINTN *Size\r
+ )\r
+{\r
+ EFI_STATUS Status;\r
+ EFI_FV_FILETYPE FileType;\r
+ EFI_FV_FILE_ATTRIBUTES Attributes;\r
+ UINT32 AuthenticationStatus;\r
+\r
+ //\r
+ // Read desired section content in NameGuid file\r
+ //\r
+ *Buffer = NULL;\r
+ *Size = 0;\r
+ Status = Fv->ReadSection (\r
+ Fv,\r
+ NameGuid,\r
+ SectionType,\r
+ 0,\r
+ Buffer,\r
+ Size,\r
+ &AuthenticationStatus\r
+ );\r
+\r
+ if (EFI_ERROR (Status) && (SectionType == EFI_SECTION_TE)) {\r
+ //\r
+ // Try reading PE32 section, since the TE section does not exist\r
+ //\r
+ *Buffer = NULL;\r
+ *Size = 0;\r
+ Status = Fv->ReadSection (\r
+ Fv,\r
+ NameGuid,\r
+ EFI_SECTION_PE32,\r
+ 0,\r
+ Buffer,\r
+ Size,\r
+ &AuthenticationStatus\r
+ );\r
+ }\r
+\r
+ if (EFI_ERROR (Status) && \r
+ ((SectionType == EFI_SECTION_TE) || (SectionType == EFI_SECTION_PE32))) {\r
+ //\r
+ // Try reading raw file, since the desired section does not exist\r
+ //\r
+ *Buffer = NULL;\r
+ *Size = 0;\r
+ Status = Fv->ReadFile (\r
+ Fv,\r
+ NameGuid,\r
+ Buffer,\r
+ Size,\r
+ &FileType,\r
+ &Attributes,\r
+ &AuthenticationStatus\r
+ );\r
+ }\r
+\r
+ return Status;\r
+}\r
+\r
+/**\r
+ Allocate and fill a buffer with an image identified by a Firmware File GUID name and a Firmware Section type. \r
+ The Firmware Volumes to search for the Firmware File can be specified to be either all Firmware Volumes \r
+ in the system, or the Firmware Volume which contains the Firmware File specified by an image handle.\r
+\r
+ If ImageHandle is NULL, all Firmware Volumes in the system will be searched. If ImageHandle is not NULL, \r
+ ImageHandle is interpreted as EFI_PEI_FILE_HANDLE for the implementation of this function for PEI phase. \r
+ The input parameter ImageHandle is interpreted as EFI_HANDLE, on which an EFI_LOADED_IMAGE_PROTOCOL \r
+ is installed, for the implementation of this function for DXE phase. The search always starts from the FV \r
+ identified by ImageHandle. If WithinImageFv is TRUE, search will only be performed on the first FV. If WithinImageFv \r
+ is FALSE, search will continue on other FVs if it fails on the first FV. The search order of Firmware Volumes is \r
+ deterministic but arbitrary if no new firmware volume is added into the system between each search. \r
+ \r
+ The search order for the section type specified by SectionType in the Firmware File is using a depth-first \r
+ and left-to-right algorithm through all sections. The first section found to match SectionType will be returned. \r
+ \r
+ If SectionType is EFI_SECTION_PE32, EFI_SECTION_PE32 will be used as Firmware Section type \r
+ to read Firmware Section data from the Firmware File. If no such section exists, the function will try \r
+ to read a Firmware File named with NameGuid. If no such file exists, EFI_NOT_FOUND is returned.\r
+ \r
+ If SectionType is EFI_SECTION_TE, EFI_SECTION_TE will be used as Firmware Section type to read Firmware Section \r
+ data from the Firmware File. If no such section exists, EFI_SECTION_PE32 will be used as Firmware Section type to \r
+ read Firmware Section data from the Firmware File. If no such section exists, the function will try to read a Firmware \r
+ File named with NameGuid. If no such file exists, EFI_NOT_FOUND is returned.\r
+ \r
+ The data and size is returned by Buffer and Size. The caller is responsible to free the Buffer allocated \r
+ by this function. This function can only be called at TPL_NOTIFY and below.\r
+ \r
+ If ImageHandle is NULL and WithinImage is TRUE, then ASSERT ();\r
+ If NameGuid is NULL, then ASSERT();\r
+ If Buffer is NULL, then ASSERT();\r
+ If Size is NULL, then ASSERT().\r
+\r
+ @param NameGuid The GUID name of a Firmware File.\r
+ @param SectionType The Firmware Section type.\r
+ @param Buffer On output, Buffer contains the the data read from the section in the Firmware File found.\r
+ @param Size On output, the size of Buffer.\r
+\r
+ @retval EFI_SUCCESS The image is found and data and size is returned.\r
+ @retval EFI_NOT_FOUND The image specified by NameGuid and SectionType can't be found.\r
+ @retval EFI_OUT_OF_RESOURCES There were not enough resources to allocate the output data buffer or complete the operations.\r
+ @retval EFI_DEVICE_ERROR A hardware error occurs during reading from the Firmware Volume.\r
+ @retval EFI_ACCESS_DENIED The firmware volume containing the searched Firmware File is configured to disallow reads.\r
+\r
+**/\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+GetSectionFromFvFile (\r
+ IN CONST VOID *ImageHandle,\r
+ IN CONST EFI_GUID *NameGuid,\r
+ IN EFI_SECTION_TYPE SectionType,\r
+ OUT VOID **Buffer,\r
+ OUT UINTN *Size,\r
+ IN BOOLEAN WithinImageFv\r
+ )\r
+{\r
+ EFI_STATUS Status;\r
+ EFI_HANDLE *HandleBuffer;\r
+ UINTN HandleCount;\r
+ UINTN Index;\r
+ EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;\r
+ EFI_FIRMWARE_VOLUME2_PROTOCOL *ImageFv;\r
+ EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;\r
+\r
+ ASSERT (NameGuid != NULL);\r
+ ASSERT (Buffer != NULL);\r
+ ASSERT (Size != NULL);\r
+ ASSERT (!(ImageHandle == NULL && WithinImageFv));\r
+\r
+ Status = EFI_NOT_FOUND;\r
+ ImageFv = NULL;\r
+ if (ImageHandle != NULL) {\r
+ Status = gBS->HandleProtocol (\r
+ (EFI_HANDLE *) ImageHandle,\r
+ &gEfiLoadedImageProtocolGuid,\r
+ (VOID **) &LoadedImage\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
+ Status = gBS->HandleProtocol (\r
+ LoadedImage->DeviceHandle,\r
+ &gEfiFirmwareVolume2ProtocolGuid,\r
+ (VOID **) &ImageFv\r
+ );\r
+ if (!EFI_ERROR (Status)) {\r
+ Status = GetImageFromFv (ImageFv, NameGuid, SectionType, Buffer, Size);\r
+ }\r
+ }\r
+\r
+ if (Status == EFI_SUCCESS || WithinImageFv) {\r
+ return Status;\r
+ }\r
+\r
+ HandleBuffer = NULL;\r
+ Status = gBS->LocateHandleBuffer (\r
+ ByProtocol,\r
+ &gEfiFirmwareVolume2ProtocolGuid,\r
+ NULL,\r
+ &HandleCount,\r
+ &HandleBuffer\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ goto Done;\r
+ }\r
+\r
+ //\r
+ // Find desired image in all Fvs\r
+ //\r
+ for (Index = 0; Index < HandleCount; ++Index) {\r
+ Status = gBS->HandleProtocol (\r
+ HandleBuffer[Index],\r
+ &gEfiFirmwareVolume2ProtocolGuid,\r
+ (VOID**)&Fv\r
+ );\r
+\r
+ if (EFI_ERROR (Status)) {\r
+ goto Done;\r
+ }\r
+\r
+ if (ImageFv != NULL && Fv == ImageFv) {\r
+ continue;\r
+ }\r
+\r
+ Status = GetImageFromFv (Fv, NameGuid, SectionType, Buffer, Size);\r
+\r
+ if (!EFI_ERROR (Status)) {\r
+ goto Done;\r
+ }\r
+ }\r
+\r
+ //\r
+ // Not found image\r
+ //\r
+ if (Index == HandleCount) {\r
+ Status = EFI_NOT_FOUND;\r
+ }\r
+\r
+Done:\r
+\r
+ if (HandleBuffer != NULL) { \r
+ FreePool(HandleBuffer);\r
+ }\r
+\r
+ return Status;\r
+}\r
+\r
--- /dev/null
+#/** @file\r
+# Component description file library instance for PiLib for DXE phase.\r
+#\r
+# Library to abstract utility functions that is related to PI Specification.\r
+#\r
+# Copyright (c) 2007, Intel Corporation.\r
+#\r
+# All rights reserved. This program and the accompanying materials\r
+# are licensed and made available under the terms and conditions of the BSD License\r
+# which accompanies this distribution. The full text of the license may be found at\r
+# http://opensource.org/licenses/bsd-license.php\r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r
+[Defines]\r
+ INF_VERSION = 0x00010005\r
+ BASE_NAME = DxePiLib\r
+ FILE_GUID = EE680C58-FFC0-4a5d-858F-66FF9C84BC9F\r
+ MODULE_TYPE = DXE_DRIVER\r
+ VERSION_STRING = 1.0\r
+ LIBRARY_CLASS = PiLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r
+ EDK_RELEASE_VERSION = 0x00020000\r
+ EFI_SPECIFICATION_VERSION = 0x00020000\r
+\r
+\r
+#\r
+# VALID_ARCHITECTURES = IA32 X64 IPF EBC\r
+#\r
+\r
+[Sources.common]\r
+ DxePiLib.c\r
+\r
+[Packages]\r
+ MdePkg/MdePkg.dec\r
+\r
+\r
+[LibraryClasses]\r
+ MemoryAllocationLib\r
+ DebugLib\r
+\r
+[Protocols]\r
+ gEfiFirmwareVolume2ProtocolGuid # ALWAYS_CONSUMED\r
+\r
\r
#include <Library/MemoryAllocationLib.h>\r
#include <Library/PeiServicesTablePointerLib.h>\r
+#include <Library/PeiServicesLib.h>\r
#include <Library/BaseMemoryLib.h>\r
#include <Library/DebugLib.h>\r
\r
{\r
EFI_STATUS Status;\r
EFI_PHYSICAL_ADDRESS Memory; \r
- EFI_PEI_SERVICES **PeiServices;\r
\r
if (Pages == 0) {\r
return NULL;\r
}\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
- Status = (*PeiServices)->AllocatePages (PeiServices, MemoryType, Pages, &Memory);\r
+ Status = PeiServicesAllocatePages (MemoryType, Pages, &Memory);\r
if (EFI_ERROR (Status)) {\r
Memory = 0;\r
}\r
)\r
{\r
EFI_STATUS Status;\r
- EFI_PEI_SERVICES **PeiServices;\r
VOID *Buffer;\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
-\r
- Status = (*PeiServices)->AllocatePool (PeiServices, AllocationSize, &Buffer);\r
+ Status = PeiServicesAllocatePool (AllocationSize, &Buffer);\r
if (EFI_ERROR (Status)) {\r
Buffer = NULL;\r
}\r
DebugLib\r
BaseMemoryLib\r
PeiServicesTablePointerLib\r
+ PeiServicesLib\r
\r
\r
#include <Ppi/Pcd.h>\r
\r
+#include <Library/PeiServicesLib.h>\r
#include <Library/PcdLib.h>\r
#include <Library/DebugLib.h>\r
#include <Library/PeiServicesTablePointerLib.h>\r
{\r
EFI_STATUS Status;\r
PCD_PPI *PcdPpi;\r
- EFI_PEI_SERVICES **PeiServices;\r
-\r
-\r
- PeiServices = GetPeiServicesTablePointer ();\r
-\r
- Status = (**PeiServices).LocatePpi (\r
- PeiServices,\r
- &gPcdPpiGuid,\r
- 0,\r
- NULL,\r
- (VOID **)&PcdPpi\r
- );\r
-\r
+ \r
+ Status = PeiServicesLocatePpi (&gPcdPpiGuid, 0, NULL, (VOID **)&PcdPpi);\r
ASSERT_EFI_ERROR (Status);\r
\r
return PcdPpi;\r
[LibraryClasses]\r
BaseMemoryLib\r
PeiServicesTablePointerLib\r
+ PeiServicesLib\r
DebugLib\r
\r
\r
EFI_STATUS\r
EFIAPI\r
PeiServicesInstallPpi (\r
- IN EFI_PEI_PPI_DESCRIPTOR *PpiList\r
+ IN CONST EFI_PEI_PPI_DESCRIPTOR *PpiList\r
)\r
{\r
- EFI_PEI_SERVICES **PeiServices;\r
+ CONST EFI_PEI_SERVICES **PeiServices;\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
+ PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
return (*PeiServices)->InstallPpi (PeiServices, PpiList);\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
PeiServicesReInstallPpi (\r
- IN EFI_PEI_PPI_DESCRIPTOR *OldPpi,\r
- IN EFI_PEI_PPI_DESCRIPTOR *NewPpi\r
+ IN CONST EFI_PEI_PPI_DESCRIPTOR *OldPpi,\r
+ IN CONST EFI_PEI_PPI_DESCRIPTOR *NewPpi\r
)\r
{\r
- EFI_PEI_SERVICES **PeiServices;\r
+ CONST EFI_PEI_SERVICES **PeiServices;\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
+ PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
return (*PeiServices)->ReInstallPpi (PeiServices, OldPpi, NewPpi);\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
PeiServicesLocatePpi (\r
- IN EFI_GUID *Guid,\r
+ IN CONST EFI_GUID *Guid,\r
IN UINTN Instance,\r
IN OUT EFI_PEI_PPI_DESCRIPTOR **PpiDescriptor,\r
IN OUT VOID **Ppi\r
)\r
{\r
- EFI_PEI_SERVICES **PeiServices;\r
+ CONST EFI_PEI_SERVICES **PeiServices;\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
+ PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
return (*PeiServices)->LocatePpi (PeiServices, Guid, Instance, PpiDescriptor, Ppi);\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
PeiServicesNotifyPpi (\r
- IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyList\r
+ IN CONST EFI_PEI_NOTIFY_DESCRIPTOR *NotifyList\r
)\r
{\r
- EFI_PEI_SERVICES **PeiServices;\r
+ CONST EFI_PEI_SERVICES **PeiServices;\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
+ PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
return (*PeiServices)->NotifyPpi (PeiServices, NotifyList);\r
}\r
\r
IN OUT EFI_BOOT_MODE *BootMode\r
)\r
{\r
- EFI_PEI_SERVICES **PeiServices;\r
+ CONST EFI_PEI_SERVICES **PeiServices;\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
+ PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
return (*PeiServices)->GetBootMode (PeiServices, BootMode);\r
}\r
\r
IN EFI_BOOT_MODE BootMode\r
)\r
{\r
- EFI_PEI_SERVICES **PeiServices;\r
+ CONST EFI_PEI_SERVICES **PeiServices;\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
+ PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
return (*PeiServices)->SetBootMode (PeiServices, BootMode);\r
}\r
\r
IN OUT VOID **HobList\r
)\r
{\r
- EFI_PEI_SERVICES **PeiServices;\r
+ CONST EFI_PEI_SERVICES **PeiServices;\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
+ PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
return (*PeiServices)->GetHobList (PeiServices, HobList);\r
}\r
\r
IN OUT VOID **Hob\r
)\r
{\r
- EFI_PEI_SERVICES **PeiServices;\r
+ CONST EFI_PEI_SERVICES **PeiServices;\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
+ PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
return (*PeiServices)->CreateHob (PeiServices, Type, Length, Hob);\r
}\r
\r
EFIAPI\r
PeiServicesFfsFindNextVolume (\r
IN UINTN Instance,\r
- IN OUT EFI_FIRMWARE_VOLUME_HEADER **FwVolHeader\r
+ IN OUT EFI_PEI_FV_HANDLE *VolumeHandle\r
)\r
{\r
- EFI_PEI_SERVICES **PeiServices;\r
+ CONST EFI_PEI_SERVICES **PeiServices;\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
- return (*PeiServices)->FfsFindNextVolume (PeiServices, Instance, FwVolHeader);\r
+ PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+ return (*PeiServices)->FfsFindNextVolume (PeiServices, Instance, VolumeHandle);\r
}\r
\r
/**\r
EFIAPI\r
PeiServicesFfsFindNextFile (\r
IN EFI_FV_FILETYPE SearchType,\r
- IN EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader,\r
- IN OUT EFI_FFS_FILE_HEADER **FileHeader\r
+ IN EFI_PEI_FV_HANDLE VolumeHandle,\r
+ IN OUT EFI_PEI_FILE_HANDLE *FileHandle\r
)\r
{\r
- EFI_PEI_SERVICES **PeiServices;\r
+ CONST EFI_PEI_SERVICES **PeiServices;\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
- return (*PeiServices)->FfsFindNextFile (PeiServices, SearchType, FwVolHeader, FileHeader);\r
+ PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
+ return (*PeiServices)->FfsFindNextFile (PeiServices, SearchType, VolumeHandle, FileHandle);\r
}\r
\r
/**\r
EFIAPI\r
PeiServicesFfsFindSectionData (\r
IN EFI_SECTION_TYPE SectionType,\r
- IN EFI_FFS_FILE_HEADER *FfsFileHeader,\r
+ IN EFI_PEI_FILE_HANDLE FfsFileHeader,\r
IN OUT VOID **SectionData\r
)\r
{\r
- EFI_PEI_SERVICES **PeiServices;\r
+ CONST EFI_PEI_SERVICES **PeiServices;\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
+ PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
return (*PeiServices)->FfsFindSectionData (PeiServices, SectionType, FfsFileHeader, SectionData);\r
}\r
\r
IN UINT64 MemoryLength\r
)\r
{\r
- EFI_PEI_SERVICES **PeiServices;\r
+ CONST EFI_PEI_SERVICES **PeiServices;\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
+ PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
return (*PeiServices)->InstallPeiMemory (PeiServices, MemoryBegin, MemoryLength);\r
}\r
\r
IN OUT EFI_PHYSICAL_ADDRESS *Memory\r
)\r
{\r
- EFI_PEI_SERVICES **PeiServices;\r
+ CONST EFI_PEI_SERVICES **PeiServices;\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
+ PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
return (*PeiServices)->AllocatePages (PeiServices, MemoryType, Pages, Memory);\r
}\r
\r
OUT VOID **Buffer\r
)\r
{\r
- EFI_PEI_SERVICES **PeiServices;\r
+ CONST EFI_PEI_SERVICES **PeiServices;\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
+ PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();\r
return (*PeiServices)->AllocatePool (PeiServices, Size, Buffer);\r
}\r
\r
VOID\r
)\r
{\r
- EFI_PEI_SERVICES **PeiServices;\r
+ EFI_PEI_SERVICES **PeiServices;\r
\r
PeiServices = GetPeiServicesTablePointer ();\r
return (*PeiServices)->ResetSystem (PeiServices);\r
#include <Library/SmbusLib.h>\r
#include <Library/DebugLib.h>\r
#include <Library/PeiServicesTablePointerLib.h>\r
+#include <Library/PeiServicesLib.h>\r
#include <Library/BaseMemoryLib.h>\r
\r
#define SMBUS_LIB_SLAVE_ADDRESS(SmBusAddress) (((SmBusAddress) >> 1) & 0x7f)\r
\r
This internal function retrieves Smbus PPI from PPI database.\r
\r
- @param PeiServices An indirect pointer to the EFI_PEI_SERVICES published by the PEI Foundation.\r
+ @param VOID\r
\r
@return The pointer to Smbus PPI.\r
\r
**/\r
EFI_PEI_SMBUS2_PPI *\r
InternalGetSmbusPpi (\r
- EFI_PEI_SERVICES **PeiServices\r
+ VOID\r
);\r
\r
/**\r
**/\r
EFI_PEI_SMBUS2_PPI *\r
InternalGetSmbusPpi (\r
- EFI_PEI_SERVICES **PeiServices\r
+ VOID\r
)\r
{\r
EFI_STATUS Status;\r
EFI_PEI_SMBUS2_PPI *SmbusPpi;\r
\r
- Status = (*PeiServices)->LocatePpi (PeiServices, &gEfiPeiSmbus2PpiGuid, 0, NULL, (VOID **) &SmbusPpi);\r
+ Status = PeiServicesLocatePpi (&gEfiPeiSmbus2PpiGuid, 0, NULL, (VOID **) &SmbusPpi);\r
ASSERT_EFI_ERROR (Status);\r
ASSERT (SmbusPpi != NULL);\r
\r
)\r
{\r
EFI_PEI_SMBUS2_PPI *SmbusPpi;\r
- EFI_PEI_SERVICES **PeiServices;\r
RETURN_STATUS ReturnStatus;\r
EFI_SMBUS_DEVICE_ADDRESS SmbusDeviceAddress;\r
\r
- PeiServices = GetPeiServicesTablePointer ();\r
- SmbusPpi = InternalGetSmbusPpi (PeiServices);\r
+ SmbusPpi = InternalGetSmbusPpi ();\r
SmbusDeviceAddress.SmbusDeviceAddress = SMBUS_LIB_SLAVE_ADDRESS (SmBusAddress);\r
\r
ReturnStatus = SmbusPpi->Execute (\r
[LibraryClasses]\r
BaseMemoryLib\r
PeiServicesTablePointerLib\r
+ PeiServicesLib\r
DebugLib\r
\r
[Ppis]\r
PrintLib\r
UefiBootServicesTableLib\r
\r
-\r
-\r
-[FixedPcd.common]\r
- gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue\r
- gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask\r
-\r
-\r
[Pcd.common]\r
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel\r
+ gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue\r
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask\r
\r
PrintLib\r
UefiBootServicesTableLib\r
\r
-\r
-[FixedPcd.common]\r
- gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue\r
- gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask\r
-\r
-\r
[Pcd.common]\r
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel\r
+ gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue\r
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask\r
\r
return EFI_SUCCESS;\r
}\r
\r
+\r
gEfiDriverConfigurationProtocolGuid # SOMETIMES_CONSUMED\r
gEfiDriverDiagnosticsProtocolGuid # SOMETIMES_CONSUMED\r
gEfiDriverDiagnostics2ProtocolGuid # SOMETIMES_CONSUMED\r
+ gEfiFirmwareVolume2ProtocolGuid # ALWAYS_CONSUMED\r
\r
\r
-[FixedPcd.common]\r
+[Pcd.common]\r
gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize\r
\r
[FeaturePcd.common]\r
#include <Protocol/DriverConfiguration.h>\r
#include <Protocol/DriverDiagnostics.h>\r
#include <Protocol/DriverDiagnostics2.h>\r
+#include <Protocol/FirmwareVolume2.h>\r
+#include <Protocol/LoadedImage.h>\r
+\r
#include <Guid/EventGroup.h>\r
#include <Guid/EventLegacyBios.h>\r
#include <Library/UefiLib.h>\r
#include <Library/PcdLib.h>\r
#include <Library/PrintLib.h>\r
\r
+\r
#endif\r
MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf\r
MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
+ MdePkg/Library/DxePiLib/DxePiLib.inf\r
MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf\r
MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf\r