tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
vanjeff 2008-09-03 08:55:55 +00:00
parent f36a7bf58c
commit 8ee3a19908
9 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
DuetPkg/FvbRuntimeService/FWBlockService.c
View File

@ -305,7 +305,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
) )
@ -477,10 +477,10 @@ Returns:
--*/ --*/
{ {
EFI_FVB_ATTRIBUTES Attributes; EFI_FVB_ATTRIBUTES_2 Attributes;
UINTN LbaAddress; UINTN LbaAddress;
UINTN LbaLength; UINTN LbaLength;
EFI_STATUS Status; EFI_STATUS Status;
// //
// Check for invalid conditions // Check for invalid conditions
@ -561,12 +561,12 @@ Returns:
--*/ --*/
{ {
EFI_FVB_ATTRIBUTES Attributes; EFI_FVB_ATTRIBUTES_2 Attributes;
UINTN LbaAddress; UINTN LbaAddress;
UINTN LbaLength; UINTN LbaLength;
EFI_FW_VOL_INSTANCE *FwhInstance; EFI_FW_VOL_INSTANCE *FwhInstance;
EFI_STATUS Status; EFI_STATUS Status;
EFI_STATUS ReturnStatus; EFI_STATUS ReturnStatus;
// //
// Find the right instance of the FVB private data // Find the right instance of the FVB private data
@ -658,11 +658,11 @@ Returns:
--*/ --*/
{ {
EFI_FVB_ATTRIBUTES Attributes; EFI_FVB_ATTRIBUTES_2 Attributes;
UINTN LbaAddress; UINTN LbaAddress;
EFI_FW_VOL_INSTANCE *FwhInstance; EFI_FW_VOL_INSTANCE *FwhInstance;
UINTN LbaLength; UINTN LbaLength;
EFI_STATUS Status; EFI_STATUS Status;
// //
// Find the right instance of the FVB private data // Find the right instance of the FVB private data
@ -796,7 +796,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
) )
@ -809,7 +809,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
@ -826,13 +826,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;
// //
// Find the right instance of the FVB private data // Find the right instance of the FVB private data
@ -840,7 +840,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_CAPABILITIES; Capabilities = OldAttributes & EFI_FVB2_CAPABILITIES;
OldStatus = OldAttributes & EFI_FVB2_STATUS; OldStatus = OldAttributes & EFI_FVB2_STATUS;
@ -983,7 +983,7 @@ EFI_STATUS
EFIAPI EFIAPI
FvbProtocolGetAttributes ( FvbProtocolGetAttributes (
IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, 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 EFIAPI
FvbProtocolSetAttributes ( FvbProtocolSetAttributes (
IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,
IN OUT EFI_FVB_ATTRIBUTES *Attributes IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes
) )
/*++ /*++

8
DuetPkg/FvbRuntimeService/FwBlockService.h
View File

@ -197,7 +197,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
) )
@ -206,7 +206,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
) )
@ -274,7 +274,7 @@ EFI_STATUS
EFIAPI EFIAPI
FvbProtocolGetAttributes ( FvbProtocolGetAttributes (
IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, 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 EFIAPI
FvbProtocolSetAttributes ( FvbProtocolSetAttributes (
IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,
IN OUT EFI_FVB_ATTRIBUTES *Attributes IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes
) )
; ;

2
MdeModulePkg/Core/Dxe/FwVol/FwVol.c
View File

@ -182,7 +182,7 @@ FvCheck (
EFI_STATUS Status; EFI_STATUS Status;
EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *Fvb; EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *Fvb;
EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader; EFI_FIRMWARE_VOLUME_HEADER *FwVolHeader;
EFI_FVB_ATTRIBUTES FvbAttributes; EFI_FVB_ATTRIBUTES_2 FvbAttributes;
EFI_FV_BLOCK_MAP_ENTRY *BlockMap; EFI_FV_BLOCK_MAP_ENTRY *BlockMap;
FFS_FILE_LIST_ENTRY *FfsFileEntry; FFS_FILE_LIST_ENTRY *FfsFileEntry;
EFI_FFS_FILE_HEADER *FfsHeader; EFI_FFS_FILE_HEADER *FfsHeader;

2
MdeModulePkg/Core/Dxe/FwVol/FwVolAttrib.c
View File

@ -35,7 +35,7 @@ FvGetVolumeAttributes (
EFI_STATUS Status; EFI_STATUS Status;
FV_DEVICE *FvDevice; FV_DEVICE *FvDevice;
EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *Fvb; EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *Fvb;
EFI_FVB_ATTRIBUTES FvbAttributes; EFI_FVB_ATTRIBUTES_2 FvbAttributes;
FvDevice = FV_DEVICE_FROM_THIS (This); FvDevice = FV_DEVICE_FROM_THIS (This);
Fvb = FvDevice->Fvb; Fvb = FvDevice->Fvb;

4
MdeModulePkg/Core/Dxe/FwVolBlock.h
View File

@ -80,7 +80,7 @@ EFI_STATUS
EFIAPI EFIAPI
FwVolBlockGetAttributes ( FwVolBlockGetAttributes (
IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, 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 EFIAPI
FwVolBlockSetAttributes ( FwVolBlockSetAttributes (
IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,
IN CONST EFI_FVB_ATTRIBUTES *Attributes IN CONST EFI_FVB_ATTRIBUTES_2 *Attributes
); );

4
MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
View File

@ -75,7 +75,7 @@ EFI_STATUS
EFIAPI EFIAPI
FwVolBlockGetAttributes ( FwVolBlockGetAttributes (
IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, 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; EFI_FW_VOL_BLOCK_DEVICE *FvbDevice;
@ -109,7 +109,7 @@ EFI_STATUS
EFIAPI EFIAPI
FwVolBlockSetAttributes ( FwVolBlockSetAttributes (
IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,
IN CONST EFI_FVB_ATTRIBUTES *Attributes IN CONST EFI_FVB_ATTRIBUTES_2 *Attributes
) )
{ {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;

6
MdeModulePkg/Library/EdkFvbServiceLib/Fvb.c
View File

@ -452,7 +452,7 @@ EfiFvbEraseBlock (
EFI_STATUS EFI_STATUS
EfiFvbGetVolumeAttributes ( EfiFvbGetVolumeAttributes (
IN UINTN Instance, IN UINTN Instance,
OUT EFI_FVB_ATTRIBUTES *Attributes OUT EFI_FVB_ATTRIBUTES_2 *Attributes
) )
{ {
ASSERT (Attributes != NULL); ASSERT (Attributes != NULL);
@ -474,7 +474,7 @@ EfiFvbGetVolumeAttributes (
@param Instance The FV instance whose attributes is going to be @param Instance The FV instance whose attributes is going to be
modified 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. 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
@ -486,7 +486,7 @@ EfiFvbGetVolumeAttributes (
EFI_STATUS EFI_STATUS
EfiFvbSetVolumeAttributes ( EfiFvbSetVolumeAttributes (
IN UINTN Instance, IN UINTN Instance,
IN OUT EFI_FVB_ATTRIBUTES *Attributes IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes
) )
{ {
ASSERT (Attributes != NULL); ASSERT (Attributes != NULL);

60
Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c
View File

@ -240,7 +240,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
) )
@ -411,10 +411,10 @@ Returns:
--*/ --*/
{ {
EFI_FVB_ATTRIBUTES Attributes; EFI_FVB_ATTRIBUTES_2 Attributes;
UINTN LbaAddress; UINTN LbaAddress;
UINTN LbaLength; UINTN LbaLength;
EFI_STATUS Status; EFI_STATUS Status;
// //
// Check for invalid conditions // Check for invalid conditions
@ -496,10 +496,10 @@ Returns:
--*/ --*/
{ {
EFI_FVB_ATTRIBUTES Attributes; EFI_FVB_ATTRIBUTES_2 Attributes;
UINTN LbaAddress; UINTN LbaAddress;
UINTN LbaLength; UINTN LbaLength;
EFI_STATUS Status; EFI_STATUS Status;
// //
// Check for invalid conditions // Check for invalid conditions
@ -573,11 +573,11 @@ Returns:
--*/ --*/
{ {
EFI_FVB_ATTRIBUTES Attributes; EFI_FVB_ATTRIBUTES_2 Attributes;
UINTN LbaAddress; UINTN LbaAddress;
UINTN LbaLength; UINTN LbaLength;
EFI_STATUS Status; EFI_STATUS Status;
UINT8 Data; UINT8 Data;
// //
// Check if the FV is write enabled // Check if the FV is write enabled
@ -716,10 +716,10 @@ 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
) )
/*++ /*++
@ -730,7 +730,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
@ -747,14 +747,14 @@ 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;
// //
// Find the right instance of the FVB private data // Find the right instance of the FVB private data
@ -762,7 +762,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 | \
@ -928,7 +928,7 @@ EFI_STATUS
EFIAPI EFIAPI
FvbProtocolGetAttributes ( FvbProtocolGetAttributes (
IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, 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 EFIAPI
FvbProtocolSetAttributes ( FvbProtocolSetAttributes (
IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,
IN OUT EFI_FVB_ATTRIBUTES *Attributes IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes
) )
/*++ /*++

8
Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h
View File

@ -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 CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, 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 EFIAPI
FvbProtocolSetAttributes ( FvbProtocolSetAttributes (
IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This, IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *This,
IN OUT EFI_FVB_ATTRIBUTES *Attributes IN OUT EFI_FVB_ATTRIBUTES_2 *Attributes
) )
; ;