BaseTools: Various typo

[mirror_edk2.git] / BaseTools / Source / C / Include / Common / PiFirmwareVolume.h

diff --git a/BaseTools/Source/C/Include/Common/PiFirmwareVolume.h b/BaseTools/Source/C/Include/Common/PiFirmwareVolume.h
index 0c8e29e1cec25698f97448089e47a45ca3f0bcf7..c495c1b2ff090e858a24630bf395fddfa1b8566f 100644 (file)
--- a/BaseTools/Source/C/Include/Common/PiFirmwareVolume.h
+++ b/BaseTools/Source/C/Include/Common/PiFirmwareVolume.h
@@ -1,21 +1,19 @@
 /** @file\r
   The firmware volume related definitions in PI.\r
 \r
-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  @par Revision Reference:\r
+  Version 1.2C\r
+\r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials are licensed and made available\r
   under the terms and conditions of the BSD License which accompanies this\r
-  distribution.  The full text of the license may be found at:\r
+  distribution.  The full text of the license may be found at\r
     http://opensource.org/licenses/bsd-license.php\r
 \r
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
-  File Name: PiFirmwareVolume.h\r
-\r
-  @par Revision Reference:\r
-  Version 1.2C\r
-\r
 **/\r
 \r
 #ifndef __PI_FIRMWAREVOLUME_H__\r
@@ -28,16 +26,16 @@ typedef UINT32  EFI_FV_FILE_ATTRIBUTES;
 \r
 //\r
 // Value of EFI_FV_FILE_ATTRIBUTES.\r
-// \r
+//\r
 #define EFI_FV_FILE_ATTRIB_ALIGNMENT      0x0000001F\r
 #define EFI_FV_FILE_ATTRIB_FIXED          0x00000100\r
 #define EFI_FV_FILE_ATTRIB_MEMORY_MAPPED  0x00000200\r
 \r
 typedef UINT32  EFI_FVB_ATTRIBUTES_2;\r
 \r
-// \r
+//\r
 // Attributes bit definitions\r
-// \r
+//\r
 #define EFI_FVB2_READ_DISABLED_CAP  0x00000001\r
 #define EFI_FVB2_READ_ENABLED_CAP   0x00000002\r
 #define EFI_FVB2_READ_STATUS        0x00000004\r
@@ -54,6 +52,7 @@ typedef UINT32  EFI_FVB_ATTRIBUTES_2;
 #define EFI_FVB2_WRITE_LOCK_CAP     0x00004000\r
 #define EFI_FVB2_WRITE_LOCK_STATUS  0x00008000\r
 #define EFI_FVB2_ALIGNMENT          0x001F0000\r
+#define EFI_FVB2_WEAK_ALIGNMENT     0x80000000\r
 #define EFI_FVB2_ALIGNMENT_1        0x00000000\r
 #define EFI_FVB2_ALIGNMENT_2        0x00010000\r
 #define EFI_FVB2_ALIGNMENT_4        0x00020000\r
@@ -110,7 +109,7 @@ typedef struct {
   EFI_FV_BLOCK_MAP_ENTRY    BlockMap[1];\r
 } EFI_FIRMWARE_VOLUME_HEADER;\r
 \r
-#define EFI_FVH_SIGNATURE EFI_SIGNATURE_32 ('_', 'F', 'V', 'H')\r
+#define EFI_FVH_SIGNATURE SIGNATURE_32 ('_', 'F', 'V', 'H')\r
 \r
 ///\r
 /// Firmware Volume Header Revision definition\r
@@ -119,7 +118,7 @@ typedef struct {
 \r
 //\r
 // Extension header pointed by ExtHeaderOffset of volume header.\r
-// \r
+//\r
 typedef struct {\r
   EFI_GUID  FvName;\r
   UINT32    ExtHeaderSize;\r
@@ -136,9 +135,9 @@ typedef struct {
   UINT32    TypeMask;\r
 \r
   //\r
-  // Array of GUIDs. \r
+  // Array of GUIDs.\r
   // Each GUID represents an OEM file type.\r
-  // \r
+  //\r
   // EFI_GUID  Types[1];\r
   //\r
 } EFI_FIRMWARE_VOLUME_EXT_ENTRY_OEM_TYPE;\r
@@ -149,10 +148,16 @@ typedef struct {
   EFI_GUID                          FormatType;\r
 \r
   //\r
-  // An arry of bytes of length Length.\r
+  // An array of bytes of length Length.\r
   //\r
   // UINT8                             Data[1];\r
   //\r
 } EFI_FIRMWARE_VOLUME_EXT_ENTRY_GUID_TYPE;\r
 \r
+#define EFI_FV_EXT_TYPE_USED_SIZE_TYPE 0x03\r
+typedef struct {\r
+  EFI_FIRMWARE_VOLUME_EXT_ENTRY Hdr;\r
+  UINT32 UsedSize;\r
+} EFI_FIRMWARE_VOLUME_EXT_ENTRY_USED_SIZE_TYPE;\r
+\r
 #endif\r