mirror of https://github.com/acidanthera/audk.git
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@3771 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
22936e958f
commit
e1001af1d4
|
@ -20,7 +20,7 @@ Abstract:
|
|||
|
||||
--*/
|
||||
|
||||
#include <EdkGenericBdsLibInternal.h>
|
||||
#include "EdkGenericBdsLibInternal.h"
|
||||
|
||||
BOOLEAN mEnumBootDevice = FALSE;
|
||||
|
||||
|
@ -771,7 +771,7 @@ Returns:
|
|||
UINTN NumberLoadFileHandles;
|
||||
EFI_HANDLE *LoadFileHandles;
|
||||
VOID *ProtocolInstance;
|
||||
EFI_FIRMWARE_VOLUME_PROTOCOL *Fv;
|
||||
EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;
|
||||
UINTN FvHandleCount;
|
||||
EFI_HANDLE *FvHandleBuffer;
|
||||
EFI_FV_FILETYPE Type;
|
||||
|
@ -902,7 +902,7 @@ Returns:
|
|||
//
|
||||
gBS->LocateHandleBuffer (
|
||||
ByProtocol,
|
||||
&gEfiFirmwareVolumeProtocolGuid,
|
||||
&gEfiFirmwareVolume2ProtocolGuid,
|
||||
NULL,
|
||||
&FvHandleCount,
|
||||
&FvHandleBuffer
|
||||
|
@ -910,7 +910,7 @@ Returns:
|
|||
for (Index = 0; Index < FvHandleCount; Index++) {
|
||||
gBS->HandleProtocol (
|
||||
FvHandleBuffer[Index],
|
||||
&gEfiFirmwareVolumeProtocolGuid,
|
||||
&gEfiFirmwareVolume2ProtocolGuid,
|
||||
(VOID **) &Fv
|
||||
);
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include <Protocol/DriverBinding.h>
|
||||
#include <Protocol/LoadFile.h>
|
||||
#include <Protocol/DevicePath.h>
|
||||
#include <Protocol/FirmwareVolume.h>
|
||||
#include <Protocol/FirmwareVolume2.h>
|
||||
#include <Protocol/Performance.h>
|
||||
#include <Protocol/WinNtIo.h>
|
||||
#include <Guid/PcAnsi.h>
|
||||
|
|
|
@ -426,12 +426,12 @@ Returns:
|
|||
EFI_STATUS
|
||||
EFIAPI
|
||||
SecPeiReportStatusCode (
|
||||
IN EFI_PEI_SERVICES **PeiServices,
|
||||
IN CONST EFI_PEI_SERVICES **PeiServices,
|
||||
IN EFI_STATUS_CODE_TYPE CodeType,
|
||||
IN EFI_STATUS_CODE_VALUE Value,
|
||||
IN UINT32 Instance,
|
||||
IN EFI_GUID *CallerId,
|
||||
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
|
||||
IN CONST EFI_GUID *CallerId,
|
||||
IN CONST EFI_STATUS_CODE_DATA *Data OPTIONAL
|
||||
)
|
||||
/*++
|
||||
|
||||
|
|
|
@ -170,12 +170,12 @@ Returns:
|
|||
EFI_STATUS
|
||||
EFIAPI
|
||||
SecPeiReportStatusCode (
|
||||
IN EFI_PEI_SERVICES **PeiServices,
|
||||
IN CONST EFI_PEI_SERVICES **PeiServices,
|
||||
IN EFI_STATUS_CODE_TYPE CodeType,
|
||||
IN EFI_STATUS_CODE_VALUE Value,
|
||||
IN UINT32 Instance,
|
||||
IN EFI_GUID * CallerId,
|
||||
IN EFI_STATUS_CODE_DATA * Data OPTIONAL
|
||||
IN CONST EFI_GUID * CallerId,
|
||||
IN CONST EFI_STATUS_CODE_DATA * Data OPTIONAL
|
||||
)
|
||||
/*++
|
||||
|
||||
|
|
Loading…
Reference in New Issue