X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Nt32Pkg%2FFvbServicesRuntimeDxe%2FFWBlockService.c;fp=Nt32Pkg%2FFvbServicesRuntimeDxe%2FFWBlockService.c;h=b6f3e1500c61ebb9daf55e6c4e6d0d95d2223674;hp=aa833d0a8656cea3bfa1bef1cc0c79a766eb5135;hb=8ee3a1990874ae94da24e8c2a97e941fdfcf74a6;hpb=f36a7bf58c305a14b50902cbf763211f6ef5e52f

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
   )
 /*++