Updated EFI_FVB_ATTRIBUTES to EFI_FVB_ATTRIBUTES_2.

[mirror_edk2.git] / Nt32Pkg / FvbServicesRuntimeDxe / FWBlockService.c

diff --git a/Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c b/Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c
index aa833d0a8656cea3bfa1bef1cc0c79a766eb5135..b6f3e1500c61ebb9daf55e6c4e6d0d95d2223674 100644 (file)
--- a/Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c
+++ b/Nt32Pkg/FvbServicesRuntimeDxe/FWBlockService.c
@@ -240,7 +240,7 @@ Returns:
 EFI_STATUS\r
 FvbGetVolumeAttributes (\r
   IN UINTN                                Instance,\r
 EFI_STATUS\r
 FvbGetVolumeAttributes (\r
   IN UINTN                                Instance,\r

-  OUT EFI_FVB_ATTRIBUTES                  *Attributes,\r
+  OUT EFI_FVB_ATTRIBUTES_2                *Attributes,\r

   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   )\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
   )\r


@@ -411,10 +411,10 @@ Returns:
 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

-  EFI_FVB_ATTRIBUTES  Attributes;\r
-  UINTN               LbaAddress;\r
-  UINTN               LbaLength;\r
-  EFI_STATUS          Status;\r
+  EFI_FVB_ATTRIBUTES_2  Attributes;\r
+  UINTN                 LbaAddress;\r
+  UINTN                 LbaLength;\r
+  EFI_STATUS            Status;\r

 \r
   //\r
   // Check for invalid conditions\r
 \r
   //\r
   // Check for invalid conditions\r


@@ -496,10 +496,10 @@ Returns:
 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

-  EFI_FVB_ATTRIBUTES  Attributes;\r
-  UINTN               LbaAddress;\r
-  UINTN               LbaLength;\r
-  EFI_STATUS          Status;\r
+  EFI_FVB_ATTRIBUTES_2  Attributes;\r
+  UINTN                 LbaAddress;\r
+  UINTN                 LbaLength;\r
+  EFI_STATUS            Status;\r

 \r
   //\r
   // Check for invalid conditions\r
 \r
   //\r
   // Check for invalid conditions\r


@@ -573,11 +573,11 @@ Returns:
 --*/\r
 {\r
 \r
 --*/\r
 {\r
 \r

-  EFI_FVB_ATTRIBUTES  Attributes;\r
-  UINTN               LbaAddress;\r
-  UINTN               LbaLength;\r
-  EFI_STATUS          Status;\r
-  UINT8               Data;\r
+  EFI_FVB_ATTRIBUTES_2  Attributes;\r
+  UINTN                 LbaAddress;\r
+  UINTN                 LbaLength;\r
+  EFI_STATUS            Status;\r
+  UINT8                 Data;\r

 \r
   //\r
   // Check if the FV is write enabled\r
 \r
   //\r
   // Check if the FV is write enabled\r


@@ -716,10 +716,10 @@ Returns:
 \r
 EFI_STATUS\r
 FvbSetVolumeAttributes (\r
 \r
 EFI_STATUS\r
 FvbSetVolumeAttributes (\r

-  IN UINTN                                Instance,\r
-  IN OUT EFI_FVB_ATTRIBUTES               *Attributes,\r
-  IN ESAL_FWB_GLOBAL                      *Global,\r
-  IN BOOLEAN                              Virtual\r
+  IN UINTN                                  Instance,\r
+  IN OUT EFI_FVB_ATTRIBUTES_2               *Attributes,\r
+  IN ESAL_FWB_GLOBAL                        *Global,\r
+  IN BOOLEAN                                Virtual\r

   )\r
 /*++\r
 \r
   )\r
 /*++\r
 \r


@@ -730,7 +730,7 @@ Routine Description:
 Arguments:\r
   Instance              - The FV instance whose attributes is going to be\r
                           modified\r
 Arguments:\r
   Instance              - The FV instance whose attributes is going to be\r
                           modified\r

-  Attributes            - On input, it is a pointer to EFI_FVB_ATTRIBUTES\r
+  Attributes            - On input, it is a pointer to EFI_FVB_ATTRIBUTES_2\r

                           containing the desired firmware volume settings.\r
                           On successful return, it contains the new settings\r
                           of the firmware volume\r
                           containing the desired firmware volume settings.\r
                           On successful return, it contains the new settings\r
                           of the firmware volume\r


@@ -747,14 +747,14 @@ Returns:
 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

-  EFI_FW_VOL_INSTANCE *FwhInstance;\r
-  EFI_FVB_ATTRIBUTES  OldAttributes;\r
-  EFI_FVB_ATTRIBUTES  *AttribPtr;\r
-  UINT32              Capabilities;\r
-  UINT32              OldStatus;\r
-  UINT32              NewStatus;\r
-  EFI_STATUS          Status;\r
-  EFI_FVB_ATTRIBUTES  UnchangedAttributes;\r
+  EFI_FW_VOL_INSTANCE   *FwhInstance;\r
+  EFI_FVB_ATTRIBUTES_2  OldAttributes;\r
+  EFI_FVB_ATTRIBUTES_2  *AttribPtr;\r
+  UINT32                Capabilities;\r
+  UINT32                OldStatus;\r
+  UINT32                NewStatus;\r
+  EFI_STATUS            Status;\r
+  EFI_FVB_ATTRIBUTES_2  UnchangedAttributes;\r

 \r
   //\r
   // Find the right instance of the FVB private data\r
 \r
   //\r
   // Find the right instance of the FVB private data\r


@@ -762,7 +762,7 @@ Returns:
   Status = GetFvbInstance (Instance, Global, &FwhInstance, Virtual);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = GetFvbInstance (Instance, Global, &FwhInstance, Virtual);\r
   ASSERT_EFI_ERROR (Status);\r
 \r

-  AttribPtr     = (EFI_FVB_ATTRIBUTES *) &(FwhInstance->VolumeHeader.Attributes);\r
+  AttribPtr     = (EFI_FVB_ATTRIBUTES_2 *) &(FwhInstance->VolumeHeader.Attributes);\r

   OldAttributes = *AttribPtr;\r
   Capabilities  = OldAttributes & (EFI_FVB2_READ_DISABLED_CAP | \\r
                                    EFI_FVB2_READ_ENABLED_CAP | \\r
   OldAttributes = *AttribPtr;\r
   Capabilities  = OldAttributes & (EFI_FVB2_READ_DISABLED_CAP | \\r
                                    EFI_FVB2_READ_ENABLED_CAP | \\r


@@ -928,7 +928,7 @@ EFI_STATUS
 EFIAPI\r
 FvbProtocolGetAttributes (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
 EFIAPI\r
 FvbProtocolGetAttributes (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r

-  OUT EFI_FVB_ATTRIBUTES                          *Attributes\r
+  OUT EFI_FVB_ATTRIBUTES_2                              *Attributes\r

   )\r
 /*++\r
 \r
   )\r
 /*++\r
 \r


@@ -955,7 +955,7 @@ EFI_STATUS
 EFIAPI\r
 FvbProtocolSetAttributes (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
 EFIAPI\r
 FvbProtocolSetAttributes (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r

-  IN OUT EFI_FVB_ATTRIBUTES                       *Attributes\r
+  IN OUT EFI_FVB_ATTRIBUTES_2                           *Attributes\r

   )\r
 /*++\r
 \r
   )\r
 /*++\r
 \r