Nt32Pkg/FvbServicesRuntimeDxe: correct NumOfLba vararg type in EraseBlocks()

[mirror_edk2.git] / Nt32Pkg / FvbServicesRuntimeDxe / FwBlockService.h

diff --git a/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h b/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h
index 5ff7a89763f5699682af61d5e5b5cffa3a0e152c..ad8822bd42193bbc55349630c2ebd040d0e9b969 100644 (file)
--- a/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h
+++ b/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h
@@ -1,7 +1,7 @@
 /**@file\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -46,19 +46,23 @@ typedef struct {
 //\r
 #define FVB_DEVICE_FROM_THIS(a)         CR (a, EFI_FW_VOL_BLOCK_DEVICE, FwVolBlockInstance, FVB_DEVICE_SIGNATURE)\r
 #define FVB_EXTEND_DEVICE_FROM_THIS(a)  CR (a, EFI_FW_VOL_BLOCK_DEVICE, FvbExtension, FVB_DEVICE_SIGNATURE)\r
-#define FVB_DEVICE_SIGNATURE            EFI_SIGNATURE_32 ('F', 'V', 'B', 'N')\r
+#define FVB_DEVICE_SIGNATURE            SIGNATURE_32 ('F', 'V', 'B', 'N')\r
 \r
 typedef struct {\r
-  MEMMAP_DEVICE_PATH        MemMapDevPath;\r
+  MEDIA_FW_VOL_DEVICE_PATH  FvDevPath;\r
   EFI_DEVICE_PATH_PROTOCOL  EndDevPath;\r
-} FV_DEVICE_PATH;\r
+} FV_PIWG_DEVICE_PATH;\r
+\r
+typedef struct {\r
+  MEMMAP_DEVICE_PATH          MemMapDevPath;\r
+  EFI_DEVICE_PATH_PROTOCOL    EndDevPath;\r
+} FV_MEMMAP_DEVICE_PATH;\r
 \r
 typedef struct {\r
   UINTN                               Signature;\r
-  FV_DEVICE_PATH                      DevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL            *DevicePath;\r
   UINTN                               Instance;\r
   EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  FwVolBlockInstance;\r
-  EFI_FVB_EXTENSION_PROTOCOL          FvbExtension;\r
 } EFI_FW_VOL_BLOCK_DEVICE;\r
 \r
 EFI_STATUS\r
@@ -194,10 +198,10 @@ EFI_STATUS
 EFIAPI\r
 FvbProtocolWrite (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,\r
-  IN CONST EFI_LBA                                      Lba,\r
-  IN CONST UINTN                                        Offset,\r
-  IN OUT UINTN                                    *NumBytes,\r
-  IN CONST UINT8                                        *Buffer\r
+  IN       EFI_LBA                                      Lba,\r
+  IN       UINTN                                        Offset,\r
+  IN OUT   UINTN                                        *NumBytes,\r
+  IN       UINT8                                        *Buffer\r
   );\r
 \r
 EFI_STATUS\r
@@ -207,14 +211,4 @@ FvbProtocolEraseBlocks (
   ...\r
   );\r
 \r
-EFI_STATUS\r
-EFIAPI\r
-FvbExtendProtocolEraseCustomBlockRange (\r
-  IN EFI_FVB_EXTENSION_PROTOCOL           *This,\r
-  IN EFI_LBA                              StartLba,\r
-  IN UINTN                                OffsetStartLba,\r
-  IN EFI_LBA                              LastLba,\r
-  IN UINTN                                OffsetLastLba\r
-  );\r
-\r
 #endif\r