From 8ee3a1990874ae94da24e8c2a97e941fdfcf74a6 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Wed, 3 Sep 2008 08:55:55 +0000 Subject: [PATCH] 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 +-- MdeModulePkg/Core/Dxe/FwVol/FwVol.c | 2 +- MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c | 2 +- MdeModulePkg/Core/Dxe/FwVolBlock.h | 4 +- MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c | 4 +- MdeModulePkg/Library/EdkFvbServiceLib/Fvb.c | 6 +- .../FvbServicesRuntimeDxe/FWBlockService.c | 60 +++++++++---------- .../FvbServicesRuntimeDxe/FwBlockService.h | 8 +-- 9 files changed, 75 insertions(+), 75 deletions(-) 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 ) ; diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c index 48b309fee9..f62be8ff43 100644 --- a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c +++ b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c @@ -182,7 +182,7 @@ FvCheck ( EFI_STATUS Status; EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *Fvb; EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader; - EFI_FVB_ATTRIBUTES FvbAttributes; + EFI_FVB_ATTRIBUTES_2 FvbAttributes; EFI_FV_BLOCK_MAP_ENTRY *BlockMap; FFS_FILE_LIST_ENTRY *FfsFileEntry; EFI_FFS_FILE_HEADER *FfsHeader; diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c b/MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c index 664c3af967..4c7dd99b57 100644 --- a/MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c +++ b/MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c @@ -35,7 +35,7 @@ FvGetVolumeAttributes ( EFI_STATUS Status; FV_DEVICE *FvDevice; EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *Fvb; - EFI_FVB_ATTRIBUTES FvbAttributes; + EFI_FVB_ATTRIBUTES_2 FvbAttributes; FvDevice = FV_DEVICE_FROM_THIS (This); Fvb = FvDevice->Fvb; diff --git a/MdeModulePkg/Core/Dxe/FwVolBlock.h b/MdeModulePkg/Core/Dxe/FwVolBlock.h index e2f9aa9af2..18199ef896 100644 --- a/MdeModulePkg/Core/Dxe/FwVolBlock.h +++ b/MdeModulePkg/Core/Dxe/FwVolBlock.h @@ -80,7 +80,7 @@ EFI_STATUS EFIAPI FwVolBlockGetAttributes ( IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, - OUT EFI_FVB_ATTRIBUTES *Attributes + OUT EFI_FVB_ATTRIBUTES_2 *Attributes ); @@ -102,7 +102,7 @@ EFI_STATUS EFIAPI FwVolBlockSetAttributes ( IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, - IN CONST EFI_FVB_ATTRIBUTES *Attributes + IN CONST EFI_FVB_ATTRIBUTES_2 *Attributes ); diff --git a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c index 8d45105872..2819a4402b 100644 --- a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c +++ b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c @@ -75,7 +75,7 @@ EFI_STATUS EFIAPI FwVolBlockGetAttributes ( IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, - OUT EFI_FVB_ATTRIBUTES *Attributes + OUT EFI_FVB_ATTRIBUTES_2 *Attributes ) { EFI_FW_VOL_BLOCK_DEVICE *FvbDevice; @@ -109,7 +109,7 @@ EFI_STATUS EFIAPI FwVolBlockSetAttributes ( IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, - IN CONST EFI_FVB_ATTRIBUTES *Attributes + IN CONST EFI_FVB_ATTRIBUTES_2 *Attributes ) { return EFI_UNSUPPORTED; diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.c b/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.c index 0cd0f6dcdc..733e77b019 100644 --- a/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.c +++ b/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.c @@ -452,7 +452,7 @@ EfiFvbEraseBlock ( EFI_STATUS EfiFvbGetVolumeAttributes ( IN UINTN Instance, - OUT EFI_FVB_ATTRIBUTES *Attributes + OUT EFI_FVB_ATTRIBUTES_2 *Attributes ) { ASSERT (Attributes != NULL); @@ -474,7 +474,7 @@ EfiFvbGetVolumeAttributes ( @param Instance The FV instance whose attributes is going to be modified - @param Attributes On input, it is a pointer to EFI_FVB_ATTRIBUTES + @param 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 @@ -486,7 +486,7 @@ EfiFvbGetVolumeAttributes ( EFI_STATUS EfiFvbSetVolumeAttributes ( IN UINTN Instance, - IN OUT EFI_FVB_ATTRIBUTES *Attributes + IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes ) { ASSERT (Attributes != NULL); diff --git a/Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c b/Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c index aa833d0a86..b6f3e1500c 100644 --- a/Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c +++ b/Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c @@ -240,7 +240,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 ) @@ -411,10 +411,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 @@ -496,10 +496,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 @@ -573,11 +573,11 @@ Returns: --*/ { - EFI_FVB_ATTRIBUTES Attributes; - UINTN LbaAddress; - UINTN LbaLength; - EFI_STATUS Status; - UINT8 Data; + EFI_FVB_ATTRIBUTES_2 Attributes; + UINTN LbaAddress; + UINTN LbaLength; + EFI_STATUS Status; + UINT8 Data; // // Check if the FV is write enabled @@ -716,10 +716,10 @@ Returns: EFI_STATUS FvbSetVolumeAttributes ( - IN UINTN Instance, - IN OUT EFI_FVB_ATTRIBUTES *Attributes, - IN ESAL_FWB_GLOBAL *Global, - IN BOOLEAN Virtual + IN UINTN Instance, + IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes, + IN ESAL_FWB_GLOBAL *Global, + IN BOOLEAN Virtual ) /*++ @@ -730,7 +730,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 @@ -747,14 +747,14 @@ Returns: --*/ { - EFI_FW_VOL_INSTANCE *FwhInstance; - EFI_FVB_ATTRIBUTES OldAttributes; - EFI_FVB_ATTRIBUTES *AttribPtr; - UINT32 Capabilities; - UINT32 OldStatus; - UINT32 NewStatus; - EFI_STATUS Status; - EFI_FVB_ATTRIBUTES UnchangedAttributes; + EFI_FW_VOL_INSTANCE *FwhInstance; + EFI_FVB_ATTRIBUTES_2 OldAttributes; + EFI_FVB_ATTRIBUTES_2 *AttribPtr; + UINT32 Capabilities; + UINT32 OldStatus; + UINT32 NewStatus; + EFI_STATUS Status; + EFI_FVB_ATTRIBUTES_2 UnchangedAttributes; // // Find the right instance of the FVB private data @@ -762,7 +762,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_READ_DISABLED_CAP | \ EFI_FVB2_READ_ENABLED_CAP | \ @@ -928,7 +928,7 @@ EFI_STATUS EFIAPI FvbProtocolGetAttributes ( IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, - OUT EFI_FVB_ATTRIBUTES *Attributes + OUT EFI_FVB_ATTRIBUTES_2 *Attributes ) /*++ @@ -955,7 +955,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/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h b/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h index 897d576339..6e392084da 100644 --- a/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h +++ b/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h @@ -104,7 +104,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 ) @@ -113,7 +113,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 ) @@ -164,7 +164,7 @@ EFI_STATUS EFIAPI FvbProtocolGetAttributes ( IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, - OUT EFI_FVB_ATTRIBUTES *Attributes + OUT EFI_FVB_ATTRIBUTES_2 *Attributes ) ; @@ -172,7 +172,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 ) ; -- 2.39.2