Fix the bug that Boot Mainteinance Manager in the front page can not be entered twice...

[mirror_edk2.git] / DuetPkg / FvbRuntimeService / FwBlockService.h

diff --git a/DuetPkg/FvbRuntimeService/FwBlockService.h b/DuetPkg/FvbRuntimeService/FwBlockService.h
index 1e01cd9007e34d86402f02dbce96705275b1a9e8..bec2572a3cde401d201f770aa3bd5915a56174a3 100644 (file)
--- a/DuetPkg/FvbRuntimeService/FwBlockService.h
+++ b/DuetPkg/FvbRuntimeService/FwBlockService.h
@@ -30,9 +30,7 @@ Abstract:
 //\r
 #include <Guid/EventGroup.h>\r
 #include <Guid/FirmwareFileSystem2.h>\r
-#include <Protocol/FvbExtension.h>\r
 #include <Protocol/FirmwareVolumeBlock.h>\r
-#include <Guid/AlternateFvBlock.h>\r
 #include <Protocol/DevicePath.h>\r
 #include <Protocol/SimpleFileSystem.h>\r
 #include <Protocol/BlockIo.h>\r
@@ -40,8 +38,6 @@ Abstract:
 #include <Guid/SystemNvDataGuid.h>\r
 #include <Guid/FlashMapHob.h>\r
 #include <Guid/HobList.h>\r
-#include <Guid/AlternateFvBlock.h>\r
-#include <Protocol/FvbExtension.h>\r
 \r
 //\r
 // The Library classes this module consumes\r
@@ -113,7 +109,7 @@ 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', 'C')\r
+#define FVB_DEVICE_SIGNATURE            SIGNATURE_32 ('F', 'V', 'B', 'C')\r
 \r
 typedef struct {\r
   MEMMAP_DEVICE_PATH        MemMapDevPath;\r
@@ -125,41 +121,35 @@ typedef struct {
   FV_DEVICE_PATH                      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
 GetFvbInfo (\r
   IN  EFI_PHYSICAL_ADDRESS              FvBaseAddress,\r
   OUT EFI_FIRMWARE_VOLUME_HEADER        **FvbInfo\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EnableFvbWrites (\r
   IN  BOOLEAN   EnableWrites\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 PlatformGetFvbWriteBase (\r
   IN  UINTN     CurrentBaseAddress,\r
   IN  UINTN     *NewBaseAddress,\r
   IN  BOOLEAN   *WriteEnabled\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EnablePlatformFvb (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 BOOLEAN\r
 SetPlatformFvbLock (\r
   IN UINTN  LbaAddress\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 FvbReadBlock (\r
@@ -170,8 +160,7 @@ FvbReadBlock (
   IN UINT8                                *Buffer,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 FvbWriteBlock (\r
@@ -182,8 +171,7 @@ FvbWriteBlock (
   IN UINT8                                *Buffer,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 FvbEraseBlock (\r
@@ -191,8 +179,7 @@ FvbEraseBlock (
   IN EFI_LBA                              Lba,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 FvbSetVolumeAttributes (\r
@@ -200,8 +187,7 @@ FvbSetVolumeAttributes (
   IN OUT EFI_FVB_ATTRIBUTES_2             *Attributes,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 FvbGetVolumeAttributes (\r
@@ -209,8 +195,7 @@ FvbGetVolumeAttributes (
   OUT EFI_FVB_ATTRIBUTES_2                *Attributes,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 FvbGetPhysicalAddress (\r
@@ -218,30 +203,26 @@ FvbGetPhysicalAddress (
   OUT EFI_PHYSICAL_ADDRESS                *Address,\r
   IN ESAL_FWB_GLOBAL                      *Global,\r
   IN BOOLEAN                              Virtual\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 EFIAPI\r
 FvbClassAddressChangeEvent (\r
   IN EFI_EVENT        Event,\r
   IN VOID             *Context\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 FvbSpecificInitialize (\r
   IN  ESAL_FWB_GLOBAL   *mFvbModuleGlobal\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 FvbGetLbaAddress (\r
@@ -252,20 +233,7 @@ FvbGetLbaAddress (
   OUT UINTN                               *NumOfBlocks,\r
   IN  ESAL_FWB_GLOBAL                     *Global,\r
   IN  BOOLEAN                             Virtual\r
-  )\r
-;\r
-\r
-EFI_STATUS\r
-FvbEraseCustomBlockRange (\r
-  IN UINTN                                Instance,\r
-  IN EFI_LBA                              StartLba,\r
-  IN UINTN                                OffsetStartLba,\r
-  IN EFI_LBA                              LastLba,\r
-  IN UINTN                                OffsetLastLba,\r
-  IN ESAL_FWB_GLOBAL                      *Global,\r
-  IN BOOLEAN                              Virtual\r
-  )\r
-;\r
+  );\r
 \r
 //\r
 // Protocol APIs\r
@@ -275,24 +243,21 @@ EFIAPI
 FvbProtocolGetAttributes (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL          *This,\r
   OUT      EFI_FVB_ATTRIBUTES_2                        *Attributes\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolSetAttributes (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL       *This,\r
   IN OUT   EFI_FVB_ATTRIBUTES_2                     *Attributes\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolGetPhysicalAddress (\r
   IN  CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL          *This,\r
   OUT       EFI_PHYSICAL_ADDRESS                        *Address\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -301,8 +266,7 @@ FvbProtocolGetBlockSize (
   IN  EFI_LBA                                     Lba,\r
   OUT UINTN                                       *BlockSize,\r
   OUT UINTN                                       *NumOfBlocks\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -312,8 +276,7 @@ FvbProtocolRead (
   IN UINTN                                        Offset,\r
   IN OUT UINTN                                    *NumBytes,\r
   IN UINT8                                        *Buffer\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -323,26 +286,13 @@ FvbProtocolWrite (
   IN UINTN                                        Offset,\r
   IN OUT UINTN                                    *NumBytes,\r
   IN UINT8                                        *Buffer\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
 FvbProtocolEraseBlocks (\r
   IN CONST EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL    *This,\r
   ...  \r
-  )\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
+  );\r
 \r
 #endif\r