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
This commit is contained in:
parent
13b2f60d84
commit
1c9d209fc4
|
@ -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 <PiPei.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
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
|
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
#include <PiPei.h>
|
#include <PiPei.h>
|
||||||
|
|
||||||
|
#include <Framework/PeiCis.h>
|
||||||
#include <Framework/DataHubRecords.h>
|
#include <Framework/DataHubRecords.h>
|
||||||
#include <Framework/FirmwareVolumeImageFormat.h>
|
#include <Framework/FirmwareVolumeImageFormat.h>
|
||||||
#include <Framework/FirmwareVolumeHeader.h>
|
#include <Framework/FirmwareVolumeHeader.h>
|
||||||
|
|
|
@ -538,7 +538,7 @@ Returns:
|
||||||
// Set gInMemory global variable to TRUE to indicate the dxeipl is shadowed.
|
// Set gInMemory global variable to TRUE to indicate the dxeipl is shadowed.
|
||||||
//
|
//
|
||||||
*(BOOLEAN *) ((UINTN) &gInMemory + (UINTN) DxeIplEntryPoint - (UINTN) _ModuleEntryPoint) = TRUE;
|
*(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;
|
return Status;
|
||||||
|
|
|
@ -129,7 +129,7 @@ EFI_STATUS
|
||||||
//
|
//
|
||||||
typedef union {
|
typedef union {
|
||||||
PEI_CORE_ENTRY_POINT PeiCore;
|
PEI_CORE_ENTRY_POINT PeiCore;
|
||||||
EFI_PEIM_ENTRY_POINT PeimEntry;
|
EFI_PEIM_ENTRY_POINT2 PeimEntry;
|
||||||
EFI_PEIM_NOTIFY_ENTRY_POINT PeimNotifyEntry;
|
EFI_PEIM_NOTIFY_ENTRY_POINT PeimNotifyEntry;
|
||||||
EFI_DXE_IPL_PPI *DxeIpl;
|
EFI_DXE_IPL_PPI *DxeIpl;
|
||||||
EFI_PEI_PPI_DESCRIPTOR *PpiDescriptor;
|
EFI_PEI_PPI_DESCRIPTOR *PpiDescriptor;
|
||||||
|
|
|
@ -50,8 +50,8 @@ typedef struct _EFI_PEI_NOTIFY_DESCRIPTOR EFI_PEI_NOTIFY_DESCRIPTOR;
|
||||||
**/
|
**/
|
||||||
typedef
|
typedef
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
(EFIAPI *EFI_PEIM_ENTRY_POINT)(
|
(EFIAPI *EFI_PEIM_ENTRY_POINT2)(
|
||||||
IN EFI_PEI_FILE_HANDLE *FfsHeader,
|
IN EFI_PEI_FILE_HANDLE *FileHandle,
|
||||||
IN EFI_PEI_SERVICES **PeiServices
|
IN EFI_PEI_SERVICES **PeiServices
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -103,8 +103,8 @@ struct _EFI_PEI_NOTIFY_DESCRIPTOR {
|
||||||
typedef struct _EFI_HOB_LOAD_PEIM {
|
typedef struct _EFI_HOB_LOAD_PEIM {
|
||||||
EFI_HOB_GENERIC_HEADER Header;
|
EFI_HOB_GENERIC_HEADER Header;
|
||||||
EFI_PEI_FILE_HANDLE FileHandle;
|
EFI_PEI_FILE_HANDLE FileHandle;
|
||||||
EFI_PEIM_ENTRY_POINT EntryPoint;
|
EFI_PEIM_ENTRY_POINT2 EntryPoint;
|
||||||
EFI_PEIM_ENTRY_POINT InMemEntryPoint;
|
EFI_PEIM_ENTRY_POINT2 InMemEntryPoint;
|
||||||
} EFI_HOB_LOAD_PEIM;
|
} EFI_HOB_LOAD_PEIM;
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue