Align the header of variable from 1 to 4, which can avoid the size of variable conten...

[mirror_edk2.git] / MdeModulePkg / Universal / Variable / RuntimeDxe / Variable.h

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
index 011a3a000e977cb4cc9ec7584b4c734b608c14dc..b756fc6454bfa6d4628246764e3760b6f3610c1c 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
@@ -45,8 +45,8 @@ Abstract:
 \r
 #define VARIABLE_RECLAIM_THRESHOLD (1024)\r
 \r
-#define VARIABLE_STORE_SIZE (64 * 1024)\r
-#define SCRATCH_SIZE        (4 * 1024)\r
+#define VARIABLE_STORE_SIZE FixedPcdGet32(PcdVariableStoreSize)\r
+#define SCRATCH_SIZE        FixedPcdGet32(PcdMaxVariableSize)\r
 \r
 //\r
 // Define GET_PAD_SIZE to optimize compiler\r
@@ -57,6 +57,8 @@ Abstract:
 #define GET_PAD_SIZE(a) (((~a) + 1) & (ALIGNMENT - 1))\r
 #endif\r
 \r
+#define HEADER_ALIGN(Header)  (((UINTN) (Header) + HEADER_ALIGNMENT - 1) & (~(HEADER_ALIGNMENT - 1)))\r
+\r
 #define GET_VARIABLE_NAME_PTR(a)  (CHAR16 *) ((UINTN) (a) + sizeof (VARIABLE_HEADER))\r
 \r
 \r
@@ -71,6 +73,7 @@ typedef struct {
   EFI_PHYSICAL_ADDRESS  VolatileVariableBase;\r
   EFI_PHYSICAL_ADDRESS  NonVolatileVariableBase;\r
   EFI_LOCK              VariableServicesLock;\r
+  UINT32                ReentrantState;\r
 } VARIABLE_GLOBAL;\r
 \r
 typedef struct {\r