From 1c9d209fc4f1b234fe3eab44281e816e97a92a55 Mon Sep 17 00:00:00 2001 From: klu2 Date: Mon, 13 Aug 2007 17:47:57 +0000 Subject: [PATCH] Add missing definition EFI_PEIM_ENTRY_POINT to IntelFrameworkPkg and rename original to EFI_PEIM_ENTRY_POINT2 to follow PI definition. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3629 6f19259b-4bc3-4df7-8a09-765794883524 --- IntelFrameworkPkg/Include/Framework/PeiCis.h | 40 ++++++++++++++++++++ IntelFrameworkPkg/Include/FrameworkPei.h | 1 + MdeModulePkg/Core/DxeIplPeim/DxeLoad.c | 2 +- MdeModulePkg/Core/Pei/PeiMain.h | 2 +- MdePkg/Include/Pi/PiPeiCis.h | 8 ++-- 5 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 IntelFrameworkPkg/Include/Framework/PeiCis.h diff --git a/IntelFrameworkPkg/Include/Framework/PeiCis.h b/IntelFrameworkPkg/Include/Framework/PeiCis.h new file mode 100644 index 0000000000..da09a8ac7b --- /dev/null +++ b/IntelFrameworkPkg/Include/Framework/PeiCis.h @@ -0,0 +1,40 @@ +/** @file + PI PEI master include file. This file should match the PI spec. + + Copyright (c) 2006 - 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. + + @par Revision Reference: + Version 1.0. + +**/ + +#ifndef __PEICIS_H__ +#define __PEICIS_H__ + +#include + +/** + The PEI Dispatcher will invoke each PEIM one time. During this pass, the PEI + Dispatcher will pass control to the PEIM at the AddressOfEntryPoint in the PE Header. + + @param FfsHeader Pointer to the FFS file header. + @param PeiServices Describes the list of possible PEI Services. + + @return Status code + +**/ +typedef +EFI_STATUS +(EFIAPI *EFI_PEIM_ENTRY_POINT)( + IN EFI_FFS_FILE_HEADER *FfsHeader, + IN EFI_PEI_SERVICES **PeiServices + ); + +#endif \ No newline at end of file diff --git a/IntelFrameworkPkg/Include/FrameworkPei.h b/IntelFrameworkPkg/Include/FrameworkPei.h index 33d0dab178..b5e5770b41 100644 --- a/IntelFrameworkPkg/Include/FrameworkPei.h +++ b/IntelFrameworkPkg/Include/FrameworkPei.h @@ -22,6 +22,7 @@ #include +#include #include #include #include diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c index 7ec7d52039..8d3c29a579 100644 --- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c +++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c @@ -538,7 +538,7 @@ Returns: // Set gInMemory global variable to TRUE to indicate the dxeipl is shadowed. // *(BOOLEAN *) ((UINTN) &gInMemory + (UINTN) DxeIplEntryPoint - (UINTN) _ModuleEntryPoint) = TRUE; - Status = ((EFI_PEIM_ENTRY_POINT) (UINTN) DxeIplEntryPoint) ((EFI_PEI_FILE_HANDLE *) DxeIplFileHeader, GetPeiServicesTablePointer()); + Status = ((EFI_PEIM_ENTRY_POINT2) (UINTN) DxeIplEntryPoint) ((EFI_PEI_FILE_HANDLE *) DxeIplFileHeader, GetPeiServicesTablePointer()); } return Status; diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h index a46036b50f..7cdcf30a2a 100644 --- a/MdeModulePkg/Core/Pei/PeiMain.h +++ b/MdeModulePkg/Core/Pei/PeiMain.h @@ -129,7 +129,7 @@ EFI_STATUS // typedef union { PEI_CORE_ENTRY_POINT PeiCore; - EFI_PEIM_ENTRY_POINT PeimEntry; + EFI_PEIM_ENTRY_POINT2 PeimEntry; EFI_PEIM_NOTIFY_ENTRY_POINT PeimNotifyEntry; EFI_DXE_IPL_PPI *DxeIpl; EFI_PEI_PPI_DESCRIPTOR *PpiDescriptor; diff --git a/MdePkg/Include/Pi/PiPeiCis.h b/MdePkg/Include/Pi/PiPeiCis.h index c7cf4ef6cc..0e2f30ae4b 100644 --- a/MdePkg/Include/Pi/PiPeiCis.h +++ b/MdePkg/Include/Pi/PiPeiCis.h @@ -50,8 +50,8 @@ typedef struct _EFI_PEI_NOTIFY_DESCRIPTOR EFI_PEI_NOTIFY_DESCRIPTOR; **/ typedef EFI_STATUS -(EFIAPI *EFI_PEIM_ENTRY_POINT)( - IN EFI_PEI_FILE_HANDLE *FfsHeader, +(EFIAPI *EFI_PEIM_ENTRY_POINT2)( + IN EFI_PEI_FILE_HANDLE *FileHandle, IN EFI_PEI_SERVICES **PeiServices ); @@ -103,8 +103,8 @@ struct _EFI_PEI_NOTIFY_DESCRIPTOR { typedef struct _EFI_HOB_LOAD_PEIM { EFI_HOB_GENERIC_HEADER Header; EFI_PEI_FILE_HANDLE FileHandle; - EFI_PEIM_ENTRY_POINT EntryPoint; - EFI_PEIM_ENTRY_POINT InMemEntryPoint; + EFI_PEIM_ENTRY_POINT2 EntryPoint; + EFI_PEIM_ENTRY_POINT2 InMemEntryPoint; } EFI_HOB_LOAD_PEIM; -- 2.39.2