Partial checkin fixing Beagle references

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

diff --git a/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h b/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h
index 7934547c0f4b9870254ab78417adf7828cabf3a5..51332a4ad18810e1f1b0127a7d28950a58d39738 100644 (file)
--- a/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h
+++ b/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h
@@ -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
@@ -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