mirror of https://github.com/acidanthera/audk.git
fix a issue caused by code review follow up
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5957 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
24dcb5e50a
commit
dfb8993c3c
|
@ -230,7 +230,7 @@ Returns:
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
FvbGetVolumeAttributes (
|
FvbGetVolumeAttributes (
|
||||||
IN UINTN Instance,
|
IN UINTN Instance,
|
||||||
OUT EFI_FVB_ATTRIBUTES *Attributes,
|
OUT EFI_FVB_ATTRIBUTES_2 *Attributes,
|
||||||
IN ESAL_FWB_GLOBAL *Global,
|
IN ESAL_FWB_GLOBAL *Global,
|
||||||
IN BOOLEAN Virtual
|
IN BOOLEAN Virtual
|
||||||
)
|
)
|
||||||
|
@ -401,7 +401,7 @@ Returns:
|
||||||
|
|
||||||
--*/
|
--*/
|
||||||
{
|
{
|
||||||
EFI_FVB_ATTRIBUTES Attributes;
|
EFI_FVB_ATTRIBUTES_2 Attributes;
|
||||||
UINTN LbaAddress;
|
UINTN LbaAddress;
|
||||||
UINTN LbaLength;
|
UINTN LbaLength;
|
||||||
EFI_STATUS Status;
|
EFI_STATUS Status;
|
||||||
|
@ -486,7 +486,7 @@ Returns:
|
||||||
|
|
||||||
--*/
|
--*/
|
||||||
{
|
{
|
||||||
EFI_FVB_ATTRIBUTES Attributes;
|
EFI_FVB_ATTRIBUTES_2 Attributes;
|
||||||
UINTN LbaAddress;
|
UINTN LbaAddress;
|
||||||
UINTN LbaLength;
|
UINTN LbaLength;
|
||||||
EFI_STATUS Status;
|
EFI_STATUS Status;
|
||||||
|
@ -563,7 +563,7 @@ Returns:
|
||||||
--*/
|
--*/
|
||||||
{
|
{
|
||||||
|
|
||||||
EFI_FVB_ATTRIBUTES Attributes;
|
EFI_FVB_ATTRIBUTES_2 Attributes;
|
||||||
UINTN LbaAddress;
|
UINTN LbaAddress;
|
||||||
UINTN LbaLength;
|
UINTN LbaLength;
|
||||||
EFI_STATUS Status;
|
EFI_STATUS Status;
|
||||||
|
@ -707,7 +707,7 @@ Returns:
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
FvbSetVolumeAttributes (
|
FvbSetVolumeAttributes (
|
||||||
IN UINTN Instance,
|
IN UINTN Instance,
|
||||||
IN OUT EFI_FVB_ATTRIBUTES *Attributes,
|
IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes,
|
||||||
IN ESAL_FWB_GLOBAL *Global,
|
IN ESAL_FWB_GLOBAL *Global,
|
||||||
IN BOOLEAN Virtual
|
IN BOOLEAN Virtual
|
||||||
)
|
)
|
||||||
|
@ -720,7 +720,7 @@ Routine Description:
|
||||||
Arguments:
|
Arguments:
|
||||||
Instance - The FV instance whose attributes is going to be
|
Instance - The FV instance whose attributes is going to be
|
||||||
modified
|
modified
|
||||||
Attributes - On input, it is a pointer to EFI_FVB_ATTRIBUTES
|
Attributes - On input, it is a pointer to EFI_FVB_ATTRIBUTES_2
|
||||||
containing the desired firmware volume settings.
|
containing the desired firmware volume settings.
|
||||||
On successful return, it contains the new settings
|
On successful return, it contains the new settings
|
||||||
of the firmware volume
|
of the firmware volume
|
||||||
|
@ -738,13 +738,13 @@ Returns:
|
||||||
--*/
|
--*/
|
||||||
{
|
{
|
||||||
EFI_FW_VOL_INSTANCE *FwhInstance;
|
EFI_FW_VOL_INSTANCE *FwhInstance;
|
||||||
EFI_FVB_ATTRIBUTES OldAttributes;
|
EFI_FVB_ATTRIBUTES_2 OldAttributes;
|
||||||
EFI_FVB_ATTRIBUTES *AttribPtr;
|
EFI_FVB_ATTRIBUTES_2 *AttribPtr;
|
||||||
UINT32 Capabilities;
|
UINT32 Capabilities;
|
||||||
UINT32 OldStatus;
|
UINT32 OldStatus;
|
||||||
UINT32 NewStatus;
|
UINT32 NewStatus;
|
||||||
EFI_STATUS Status;
|
EFI_STATUS Status;
|
||||||
EFI_FVB_ATTRIBUTES UnchangedAttributes;
|
EFI_FVB_ATTRIBUTES_2 UnchangedAttributes;
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -753,7 +753,7 @@ Returns:
|
||||||
Status = GetFvbInstance (Instance, Global, &FwhInstance, Virtual);
|
Status = GetFvbInstance (Instance, Global, &FwhInstance, Virtual);
|
||||||
ASSERT_EFI_ERROR (Status);
|
ASSERT_EFI_ERROR (Status);
|
||||||
|
|
||||||
AttribPtr = (EFI_FVB_ATTRIBUTES *) &(FwhInstance->VolumeHeader.Attributes);
|
AttribPtr = (EFI_FVB_ATTRIBUTES_2 *) &(FwhInstance->VolumeHeader.Attributes);
|
||||||
OldAttributes = *AttribPtr;
|
OldAttributes = *AttribPtr;
|
||||||
Capabilities = OldAttributes & (EFI_FVB2_READ_DISABLED_CAP | \
|
Capabilities = OldAttributes & (EFI_FVB2_READ_DISABLED_CAP | \
|
||||||
EFI_FVB2_READ_ENABLED_CAP | \
|
EFI_FVB2_READ_ENABLED_CAP | \
|
||||||
|
@ -920,7 +920,7 @@ EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FvbProtocolGetAttributes (
|
FvbProtocolGetAttributes (
|
||||||
IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,
|
IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,
|
||||||
OUT EFI_FVB_ATTRIBUTES *Attributes
|
OUT EFI_FVB_ATTRIBUTES_2 *Attributes
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
|
@ -947,7 +947,7 @@ EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FvbProtocolSetAttributes (
|
FvbProtocolSetAttributes (
|
||||||
IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,
|
IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,
|
||||||
IN OUT EFI_FVB_ATTRIBUTES *Attributes
|
IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
|
|
|
@ -104,7 +104,7 @@ FvbEraseBlock (
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
FvbSetVolumeAttributes (
|
FvbSetVolumeAttributes (
|
||||||
IN UINTN Instance,
|
IN UINTN Instance,
|
||||||
IN OUT EFI_FVB_ATTRIBUTES *Attributes,
|
IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes,
|
||||||
IN ESAL_FWB_GLOBAL *Global,
|
IN ESAL_FWB_GLOBAL *Global,
|
||||||
IN BOOLEAN Virtual
|
IN BOOLEAN Virtual
|
||||||
)
|
)
|
||||||
|
@ -113,7 +113,7 @@ FvbSetVolumeAttributes (
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
FvbGetVolumeAttributes (
|
FvbGetVolumeAttributes (
|
||||||
IN UINTN Instance,
|
IN UINTN Instance,
|
||||||
OUT EFI_FVB_ATTRIBUTES *Attributes,
|
OUT EFI_FVB_ATTRIBUTES_2 *Attributes,
|
||||||
IN ESAL_FWB_GLOBAL *Global,
|
IN ESAL_FWB_GLOBAL *Global,
|
||||||
IN BOOLEAN Virtual
|
IN BOOLEAN Virtual
|
||||||
)
|
)
|
||||||
|
@ -164,7 +164,7 @@ EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FvbProtocolGetAttributes (
|
FvbProtocolGetAttributes (
|
||||||
IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,
|
IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,
|
||||||
OUT EFI_FVB_ATTRIBUTES *Attributes
|
OUT EFI_FVB_ATTRIBUTES_2 *Attributes
|
||||||
)
|
)
|
||||||
;
|
;
|
||||||
|
|
||||||
|
@ -172,7 +172,7 @@ EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
FvbProtocolSetAttributes (
|
FvbProtocolSetAttributes (
|
||||||
IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,
|
IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,
|
||||||
IN OUT EFI_FVB_ATTRIBUTES *Attributes
|
IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes
|
||||||
)
|
)
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
|
@ -181,6 +181,10 @@
|
||||||
UnixLib|UnixPkg/Library/DxeUnixLib/DxeUnixLib.inf
|
UnixLib|UnixPkg/Library/DxeUnixLib/DxeUnixLib.inf
|
||||||
OemHookStatusCodeLib|UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
|
OemHookStatusCodeLib|UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
|
||||||
DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
|
DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
|
||||||
|
NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
|
||||||
|
UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
|
||||||
|
IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
|
||||||
|
DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
|
||||||
|
|
||||||
[LibraryClasses.common.DXE_DRIVER]
|
[LibraryClasses.common.DXE_DRIVER]
|
||||||
UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
|
UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
|
||||||
|
|
|
@ -152,8 +152,8 @@ APRIORI PEI {
|
||||||
INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
|
INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
|
||||||
}
|
}
|
||||||
APRIORI DXE {
|
APRIORI DXE {
|
||||||
INF IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
|
|
||||||
INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
|
INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
|
||||||
|
INF IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
|
||||||
INF UnixPkg/MetronomeDxe/Metronome.inf
|
INF UnixPkg/MetronomeDxe/Metronome.inf
|
||||||
}
|
}
|
||||||
INF MdeModulePkg/Core/Pei/PeiMain.inf
|
INF MdeModulePkg/Core/Pei/PeiMain.inf
|
||||||
|
|
Loading…
Reference in New Issue