X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FInclude%2FVariableFormat.h;h=6e4ad1a9ca6ce7a638166499a54da90a928e5c5b;hp=15b48eb8e5b42338aa1cbcfd6e6eef646089d695;hb=e56187913724379012649c0411668f94ac2ffd9f;hpb=504214c4870e9183418014634268ce630eb5332a

diff --git a/MdeModulePkg/Include/VariableFormat.h b/MdeModulePkg/Include/VariableFormat.h
index 15b48eb8e5..6e4ad1a9ca 100644
--- a/MdeModulePkg/Include/VariableFormat.h
+++ b/MdeModulePkg/Include/VariableFormat.h
@@ -1,12 +1,13 @@
-/**@file
-  Header file for EFI Variable Services.
+/** @file
+  The variable data structures are related to EDK II specific UEFI variable implementation.
+  Variable data header and Variable storage region header are defined here.
 
-  Copyright (c) 2006 - 2007 Intel Corporation. <BR>
+  Copyright (c) 2006 - 2008 Intel Corporation. <BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
   http://opensource.org/licenses/bsd-license.php
-  
+
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
@@ -15,39 +16,34 @@
 #ifndef __VARIABLE_FORMAT_H__
 #define __VARIABLE_FORMAT_H__
 
-#define VARIABLE_STORE_SIGNATURE  EFI_SIGNATURE_32 ('$', 'V', 'S', 'S')
-
-#define MAX_VARIABLE_SIZE                 FixedPcdGet32(PcdMaxVariableSize)
-
-//
-// Enlarges the hardware error record maximum variable size to 32K bytes
-//
-#define MAX_HARDWARE_ERROR_VARIABLE_SIZE  FixedPcdGet32(PcdMaxHardwareErrorVariableSize)
-
-#define VARIABLE_DATA                     0x55AA
-
-//
-// Variable Store Header flags
-//
-#define VARIABLE_STORE_FORMATTED          0x5a
-#define VARIABLE_STORE_HEALTHY            0xfe
-
-//
-// The alignment of variable's start offset.
-// For IA32/X64 architecture, the alignment is set to 1, and
-// 8 is for IPF archtecture.
-//
+///
+/// Alignment of variable name and data.
+/// For IA32/X64 architecture, the alignment is set to 1, and 8 is for IPF archtecture.
+///
 #if defined (MDE_CPU_IPF)
 #define ALIGNMENT         8
 #else
 #define ALIGNMENT         1
 #endif
 
-#define HEADER_ALIGNMENT  4
-
 //
-// Variable Store Status
+// Define GET_PAD_SIZE to optimize compiler
 //
+#if ((ALIGNMENT == 0) || (ALIGNMENT == 1))
+#define GET_PAD_SIZE(a) (0)
+#else
+#define GET_PAD_SIZE(a) (((~a) + 1) & (ALIGNMENT - 1))
+#endif
+
+///
+/// Alignment of Variable Data Header in Variable Store region
+///
+#define HEADER_ALIGNMENT  4
+#define HEADER_ALIGN(Header)  (((UINTN) (Header) + HEADER_ALIGNMENT - 1) & (~(HEADER_ALIGNMENT - 1)))
+
+///
+/// Status of Variable Store Region
+///
 typedef enum {
   EfiRaw,
   EfiValid,
@@ -55,40 +51,81 @@ typedef enum {
   EfiUnknown
 } VARIABLE_STORE_STATUS;
 
-//
-// Variable State flags
-//
-#define VAR_IN_DELETED_TRANSITION     0xfe  // Variable is in obsolete transistion
-#define VAR_DELETED                   0xfd  // Variable is obsolete
-#define VAR_HEADER_VALID_ONLY         0x7f  // Variable header has been valid
-#define VAR_ADDED                     0x3f  // Variable has been completely added
-                                            // 
-#define IS_VARIABLE_STATE(_c, _Mask)  (BOOLEAN) (((~_c) & (~_Mask)) != 0)
-
 #pragma pack(1)
 
-//
-// Variable Store region header
-//
+#define VARIABLE_STORE_SIGNATURE  SIGNATURE_32 ('$', 'V', 'S', 'S')
+
+///
+/// Variable Store Header Format and State
+///
+#define VARIABLE_STORE_FORMATTED          0x5a
+#define VARIABLE_STORE_HEALTHY            0xfe
+
+///
+/// Variable Store region header
+///
 typedef struct {
+  ///
+  /// Variable store region signature.
+  ///
   UINT32  Signature;
+  ///
+  /// Size of variable store region including this header
+  ///
   UINT32  Size;
+  ///
+  /// variable region format state
+  ///
   UINT8   Format;
+  ///
+  /// variable region healthy state
+  ///
   UINT8   State;
   UINT16  Reserved;
   UINT32  Reserved1;
 } VARIABLE_STORE_HEADER;
 
-//
-// Variable header structure
-//
+///
+/// Variable data start flag
+///
+#define VARIABLE_DATA                     0x55AA
+
+///
+/// Variable State flags
+///
+#define VAR_IN_DELETED_TRANSITION     0xfe  ///< Variable is in obsolete transistion
+#define VAR_DELETED                   0xfd  ///< Variable is obsolete
+#define VAR_HEADER_VALID_ONLY         0x7f  ///< Variable header has been valid
+#define VAR_ADDED                     0x3f  ///< Variable has been completely added
+
+///
+/// Single Variable Data Header Structure
+///
 typedef struct {
+  ///
+  /// Variable Data Start Flag
+  ///
   UINT16      StartId;
+  ///
+  /// Variable State defined above
+  ///
   UINT8       State;
   UINT8       Reserved;
+  ///
+  /// Attributes of variable defined in UEFI spec
+  ///
   UINT32      Attributes;
+  ///
+  /// Size of variable Null-terminated Unicode string name
+  ///
   UINT32      NameSize;
+  ///
+  /// Size of the variable data without this header
+  ///
   UINT32      DataSize;
+  ///
+  /// A unique identifier for the vendor that produce and consume this varaible.
+  ///
   EFI_GUID    VendorGuid;
 } VARIABLE_HEADER;