Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Include/Pi/PiFirmwareVolume.h

Timestamp:

Apr 14, 2023 3:17:44 PM (22 months ago)

Author:

vboxsync

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• MdePkg/Include/Pi/PiFirmwareVolume.h (modified) (11 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Include/Pi/PiFirmwareVolume.h

@@ -16 +16 @@
 /// EFI_FV_FILE_ATTRIBUTES
 ///
-typedef UINT32  EFI_FV_FILE_ATTRIBUTES;
+typedef UINT32 EFI_FV_FILE_ATTRIBUTES;
 
 //
@@ -28 +28 @@
 /// type of EFI FVB attribute
 ///
-typedef UINT32  EFI_FVB_ATTRIBUTES_2;
+typedef UINT32 EFI_FVB_ATTRIBUTES_2;
 
 //
 // Attributes bit definitions
 //
-#define EFI_FVB2_READ_DISABLED_CAP  0x00000001
-#define EFI_FVB2_READ_ENABLED_CAP   0x00000002
-#define EFI_FVB2_READ_STATUS        0x00000004
-#define EFI_FVB2_WRITE_DISABLED_CAP 0x00000008
-#define EFI_FVB2_WRITE_ENABLED_CAP  0x00000010
-#define EFI_FVB2_WRITE_STATUS       0x00000020
-#define EFI_FVB2_LOCK_CAP           0x00000040
-#define EFI_FVB2_LOCK_STATUS        0x00000080
-#define EFI_FVB2_STICKY_WRITE       0x00000200
-#define EFI_FVB2_MEMORY_MAPPED      0x00000400
-#define EFI_FVB2_ERASE_POLARITY     0x00000800
-#define EFI_FVB2_READ_LOCK_CAP      0x00001000
-#define EFI_FVB2_READ_LOCK_STATUS   0x00002000
-#define EFI_FVB2_WRITE_LOCK_CAP     0x00004000
-#define EFI_FVB2_WRITE_LOCK_STATUS  0x00008000
-#define EFI_FVB2_ALIGNMENT          0x001F0000
-#define EFI_FVB2_ALIGNMENT_1        0x00000000
-#define EFI_FVB2_ALIGNMENT_2        0x00010000
-#define EFI_FVB2_ALIGNMENT_4        0x00020000
-#define EFI_FVB2_ALIGNMENT_8        0x00030000
-#define EFI_FVB2_ALIGNMENT_16       0x00040000
-#define EFI_FVB2_ALIGNMENT_32       0x00050000
-#define EFI_FVB2_ALIGNMENT_64       0x00060000
-#define EFI_FVB2_ALIGNMENT_128      0x00070000
-#define EFI_FVB2_ALIGNMENT_256      0x00080000
-#define EFI_FVB2_ALIGNMENT_512      0x00090000
-#define EFI_FVB2_ALIGNMENT_1K       0x000A0000
-#define EFI_FVB2_ALIGNMENT_2K       0x000B0000
-#define EFI_FVB2_ALIGNMENT_4K       0x000C0000
-#define EFI_FVB2_ALIGNMENT_8K       0x000D0000
-#define EFI_FVB2_ALIGNMENT_16K      0x000E0000
-#define EFI_FVB2_ALIGNMENT_32K      0x000F0000
-#define EFI_FVB2_ALIGNMENT_64K      0x00100000
-#define EFI_FVB2_ALIGNMENT_128K     0x00110000
-#define EFI_FVB2_ALIGNMENT_256K     0x00120000
-#define EFI_FVB2_ALIGNMENT_512K     0x00130000
-#define EFI_FVB2_ALIGNMENT_1M       0x00140000
-#define EFI_FVB2_ALIGNMENT_2M       0x00150000
-#define EFI_FVB2_ALIGNMENT_4M       0x00160000
-#define EFI_FVB2_ALIGNMENT_8M       0x00170000
-#define EFI_FVB2_ALIGNMENT_16M      0x00180000
-#define EFI_FVB2_ALIGNMENT_32M      0x00190000
-#define EFI_FVB2_ALIGNMENT_64M      0x001A0000
-#define EFI_FVB2_ALIGNMENT_128M     0x001B0000
-#define EFI_FVB2_ALIGNMENT_256M     0x001C0000
-#define EFI_FVB2_ALIGNMENT_512M     0x001D0000
-#define EFI_FVB2_ALIGNMENT_1G       0x001E0000
-#define EFI_FVB2_ALIGNMENT_2G       0x001F0000
-#define EFI_FVB2_WEAK_ALIGNMENT     0x80000000
+#define EFI_FVB2_READ_DISABLED_CAP   0x00000001
+#define EFI_FVB2_READ_ENABLED_CAP    0x00000002
+#define EFI_FVB2_READ_STATUS         0x00000004
+#define EFI_FVB2_WRITE_DISABLED_CAP  0x00000008
+#define EFI_FVB2_WRITE_ENABLED_CAP   0x00000010
+#define EFI_FVB2_WRITE_STATUS        0x00000020
+#define EFI_FVB2_LOCK_CAP            0x00000040
+#define EFI_FVB2_LOCK_STATUS         0x00000080
+#define EFI_FVB2_STICKY_WRITE        0x00000200
+#define EFI_FVB2_MEMORY_MAPPED       0x00000400
+#define EFI_FVB2_ERASE_POLARITY      0x00000800
+#define EFI_FVB2_READ_LOCK_CAP       0x00001000
+#define EFI_FVB2_READ_LOCK_STATUS    0x00002000
+#define EFI_FVB2_WRITE_LOCK_CAP      0x00004000
+#define EFI_FVB2_WRITE_LOCK_STATUS   0x00008000
+#define EFI_FVB2_ALIGNMENT           0x001F0000
+#define EFI_FVB2_ALIGNMENT_1         0x00000000
+#define EFI_FVB2_ALIGNMENT_2         0x00010000
+#define EFI_FVB2_ALIGNMENT_4         0x00020000
+#define EFI_FVB2_ALIGNMENT_8         0x00030000
+#define EFI_FVB2_ALIGNMENT_16        0x00040000
+#define EFI_FVB2_ALIGNMENT_32        0x00050000
+#define EFI_FVB2_ALIGNMENT_64        0x00060000
+#define EFI_FVB2_ALIGNMENT_128       0x00070000
+#define EFI_FVB2_ALIGNMENT_256       0x00080000
+#define EFI_FVB2_ALIGNMENT_512       0x00090000
+#define EFI_FVB2_ALIGNMENT_1K        0x000A0000
+#define EFI_FVB2_ALIGNMENT_2K        0x000B0000
+#define EFI_FVB2_ALIGNMENT_4K        0x000C0000
+#define EFI_FVB2_ALIGNMENT_8K        0x000D0000
+#define EFI_FVB2_ALIGNMENT_16K       0x000E0000
+#define EFI_FVB2_ALIGNMENT_32K       0x000F0000
+#define EFI_FVB2_ALIGNMENT_64K       0x00100000
+#define EFI_FVB2_ALIGNMENT_128K      0x00110000
+#define EFI_FVB2_ALIGNMENT_256K      0x00120000
+#define EFI_FVB2_ALIGNMENT_512K      0x00130000
+#define EFI_FVB2_ALIGNMENT_1M        0x00140000
+#define EFI_FVB2_ALIGNMENT_2M        0x00150000
+#define EFI_FVB2_ALIGNMENT_4M        0x00160000
+#define EFI_FVB2_ALIGNMENT_8M        0x00170000
+#define EFI_FVB2_ALIGNMENT_16M       0x00180000
+#define EFI_FVB2_ALIGNMENT_32M       0x00190000
+#define EFI_FVB2_ALIGNMENT_64M       0x001A0000
+#define EFI_FVB2_ALIGNMENT_128M      0x001B0000
+#define EFI_FVB2_ALIGNMENT_256M      0x001C0000
+#define EFI_FVB2_ALIGNMENT_512M      0x001D0000
+#define EFI_FVB2_ALIGNMENT_1G        0x001E0000
+#define EFI_FVB2_ALIGNMENT_2G        0x001F0000
+#define EFI_FVB2_WEAK_ALIGNMENT      0x80000000
 
 typedef struct {
@@ -87 +87 @@
   /// The number of sequential blocks which are of the same size.
   ///
-  UINT32 NumBlocks;
+  UINT32    NumBlocks;
   ///
   /// The size of the blocks.
   ///
-  UINT32 Length;
+  UINT32    Length;
 } EFI_FV_BLOCK_MAP_ENTRY;
 
@@ -148 +148 @@
 } EFI_FIRMWARE_VOLUME_HEADER;
 
-#define EFI_FVH_SIGNATURE SIGNATURE_32 ('_', 'F', 'V', 'H')
+#define EFI_FVH_SIGNATURE  SIGNATURE_32 ('_', 'F', 'V', 'H')
 
 ///
@@ -162 +162 @@
   /// Firmware volume name.
   ///
-  EFI_GUID  FvName;
+  EFI_GUID    FvName;
   ///
   /// Size of the rest of the extension header, including this structure.
   ///
-  UINT32    ExtHeaderSize;
+  UINT32      ExtHeaderSize;
 } EFI_FIRMWARE_VOLUME_EXT_HEADER;
 
@@ -191 +191 @@
   /// Standard extension entry, with the type EFI_FV_EXT_TYPE_OEM_TYPE.
   ///
-  EFI_FIRMWARE_VOLUME_EXT_ENTRY Hdr;
+  EFI_FIRMWARE_VOLUME_EXT_ENTRY    Hdr;
   ///
   /// A bit mask, one bit for each file type between 0xC0 (bit 0) and 0xDF (bit 31). If a bit
   /// is '1', then the GUID entry exists in Types. If a bit is '0' then no GUID entry exists in Types.
   ///
-  UINT32    TypeMask;
+  UINT32                           TypeMask;
   ///
   /// An array of GUIDs, each GUID representing an OEM file type.
@@ -204 +204 @@
 } EFI_FIRMWARE_VOLUME_EXT_ENTRY_OEM_TYPE;
 
-#define EFI_FV_EXT_TYPE_GUID_TYPE 0x0002
+#define EFI_FV_EXT_TYPE_GUID_TYPE  0x0002
 
 ///
@@ -214 +214 @@
   /// Standard extension entry, with the type EFI_FV_EXT_TYPE_OEM_TYPE.
   ///
-  EFI_FIRMWARE_VOLUME_EXT_ENTRY     Hdr;
+  EFI_FIRMWARE_VOLUME_EXT_ENTRY    Hdr;
   ///
   /// Vendor-specific GUID.
   ///
-  EFI_GUID                          FormatType;
+  EFI_GUID                         FormatType;
   ///
   /// An arry of bytes of length Length.
@@ -226 +226 @@
 } EFI_FIRMWARE_VOLUME_EXT_ENTRY_GUID_TYPE;
 
-#define EFI_FV_EXT_TYPE_USED_SIZE_TYPE 0x03
+#define EFI_FV_EXT_TYPE_USED_SIZE_TYPE  0x03
 
 ///
@@ -236 +236 @@
   /// Standard extension entry, with the type EFI_FV_EXT_TYPE_USED_SIZE_TYPE.
   ///
-  EFI_FIRMWARE_VOLUME_EXT_ENTRY     Hdr;
+  EFI_FIRMWARE_VOLUME_EXT_ENTRY    Hdr;
   ///
   /// The number of bytes of the FV that are in uses. The remaining
@@ -242 +242 @@
   /// the FV must contain the value implied by EFI_FVB2_ERASE_POLARITY.
   ///
-  UINT32                            UsedSize;
+  UINT32                           UsedSize;
 } EFI_FIRMWARE_VOLUME_EXT_ENTRY_USED_SIZE_TYPE;