From 8ee3a1990874ae94da24e8c2a97e941fdfcf74a6 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Wed, 3 Sep 2008 08:55:55 +0000 Subject: Updated EFI_FVB_ATTRIBUTES to EFI_FVB_ATTRIBUTES_2. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5800 6f19259b-4bc3-4df7-8a09-765794883524 --- DuetPkg/FvbRuntimeService/FWBlockService.c | 56 +++++++++++++++--------------- DuetPkg/FvbRuntimeService/FwBlockService.h | 8 ++--- 2 files changed, 32 insertions(+), 32 deletions(-) (limited to 'DuetPkg/FvbRuntimeService') diff --git a/DuetPkg/FvbRuntimeService/FWBlockService.c b/DuetPkg/FvbRuntimeService/FWBlockService.c index 6f46bfc0f4..dbce179d65 100644 --- a/DuetPkg/FvbRuntimeService/FWBlockService.c +++ b/DuetPkg/FvbRuntimeService/FWBlockService.c @@ -305,7 +305,7 @@ Returns: EFI_STATUS FvbGetVolumeAttributes ( IN UINTN Instance, - OUT EFI_FVB_ATTRIBUTES *Attributes, + OUT EFI_FVB_ATTRIBUTES_2 *Attributes, IN ESAL_FWB_GLOBAL *Global, IN BOOLEAN Virtual ) @@ -477,10 +477,10 @@ Returns: --*/ { - EFI_FVB_ATTRIBUTES Attributes; - UINTN LbaAddress; - UINTN LbaLength; - EFI_STATUS Status; + EFI_FVB_ATTRIBUTES_2 Attributes; + UINTN LbaAddress; + UINTN LbaLength; + EFI_STATUS Status; // // Check for invalid conditions @@ -561,12 +561,12 @@ Returns: --*/ { - EFI_FVB_ATTRIBUTES Attributes; - UINTN LbaAddress; - UINTN LbaLength; - EFI_FW_VOL_INSTANCE *FwhInstance; - EFI_STATUS Status; - EFI_STATUS ReturnStatus; + EFI_FVB_ATTRIBUTES_2 Attributes; + UINTN LbaAddress; + UINTN LbaLength; + EFI_FW_VOL_INSTANCE *FwhInstance; + EFI_STATUS Status; + EFI_STATUS ReturnStatus; // // Find the right instance of the FVB private data @@ -658,11 +658,11 @@ Returns: --*/ { - EFI_FVB_ATTRIBUTES Attributes; - UINTN LbaAddress; - EFI_FW_VOL_INSTANCE *FwhInstance; - UINTN LbaLength; - EFI_STATUS Status; + EFI_FVB_ATTRIBUTES_2 Attributes; + UINTN LbaAddress; + EFI_FW_VOL_INSTANCE *FwhInstance; + UINTN LbaLength; + EFI_STATUS Status; // // Find the right instance of the FVB private data @@ -796,7 +796,7 @@ Returns: EFI_STATUS FvbSetVolumeAttributes ( IN UINTN Instance, - IN OUT EFI_FVB_ATTRIBUTES *Attributes, + IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes, IN ESAL_FWB_GLOBAL *Global, IN BOOLEAN Virtual ) @@ -809,7 +809,7 @@ Routine Description: Arguments: Instance - The FV instance whose attributes is going to be 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. On successful return, it contains the new settings of the firmware volume @@ -826,13 +826,13 @@ Returns: --*/ { - EFI_FW_VOL_INSTANCE *FwhInstance; - EFI_FVB_ATTRIBUTES OldAttributes; - EFI_FVB_ATTRIBUTES *AttribPtr; - UINT32 Capabilities; - UINT32 OldStatus; - UINT32 NewStatus; - EFI_STATUS Status; + EFI_FW_VOL_INSTANCE *FwhInstance; + EFI_FVB_ATTRIBUTES_2 OldAttributes; + EFI_FVB_ATTRIBUTES_2 *AttribPtr; + UINT32 Capabilities; + UINT32 OldStatus; + UINT32 NewStatus; + EFI_STATUS Status; // // Find the right instance of the FVB private data @@ -840,7 +840,7 @@ Returns: Status = GetFvbInstance (Instance, Global, &FwhInstance, Virtual); ASSERT_EFI_ERROR (Status); - AttribPtr = (EFI_FVB_ATTRIBUTES *) &(FwhInstance->VolumeHeader.Attributes); + AttribPtr = (EFI_FVB_ATTRIBUTES_2 *) &(FwhInstance->VolumeHeader.Attributes); OldAttributes = *AttribPtr; Capabilities = OldAttributes & EFI_FVB2_CAPABILITIES; OldStatus = OldAttributes & EFI_FVB2_STATUS; @@ -983,7 +983,7 @@ EFI_STATUS EFIAPI FvbProtocolGetAttributes ( IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, - OUT EFI_FVB_ATTRIBUTES *Attributes + OUT EFI_FVB_ATTRIBUTES_2 *Attributes ) /*++ @@ -1010,7 +1010,7 @@ EFI_STATUS EFIAPI FvbProtocolSetAttributes ( IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, - IN OUT EFI_FVB_ATTRIBUTES *Attributes + IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes ) /*++ diff --git a/DuetPkg/FvbRuntimeService/FwBlockService.h b/DuetPkg/FvbRuntimeService/FwBlockService.h index c3fe7d52b3..1e01cd9007 100644 --- a/DuetPkg/FvbRuntimeService/FwBlockService.h +++ b/DuetPkg/FvbRuntimeService/FwBlockService.h @@ -197,7 +197,7 @@ FvbEraseBlock ( EFI_STATUS FvbSetVolumeAttributes ( IN UINTN Instance, - IN OUT EFI_FVB_ATTRIBUTES *Attributes, + IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes, IN ESAL_FWB_GLOBAL *Global, IN BOOLEAN Virtual ) @@ -206,7 +206,7 @@ FvbSetVolumeAttributes ( EFI_STATUS FvbGetVolumeAttributes ( IN UINTN Instance, - OUT EFI_FVB_ATTRIBUTES *Attributes, + OUT EFI_FVB_ATTRIBUTES_2 *Attributes, IN ESAL_FWB_GLOBAL *Global, IN BOOLEAN Virtual ) @@ -274,7 +274,7 @@ EFI_STATUS EFIAPI FvbProtocolGetAttributes ( IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, - OUT EFI_FVB_ATTRIBUTES *Attributes + OUT EFI_FVB_ATTRIBUTES_2 *Attributes ) ; @@ -282,7 +282,7 @@ EFI_STATUS EFIAPI FvbProtocolSetAttributes ( IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, - IN OUT EFI_FVB_ATTRIBUTES *Attributes + IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes ) ; -- cgit v1.2.3