The ALIGNMENT definition has been moved to common header file.

[mirror_edk2.git] / EdkModulePkg / Universal / EmuVariable / RuntimeDxe / Variable.h

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Variable.h b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Variable.h
index bf21a3e86d96ea8ed6735c6c39af04f95bfa56af..f6d7a64e2c2070b56b9385c1a58ebda8fa384247 100644 (file)
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Variable.h
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Variable.h
@@ -1,18 +1,18 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this 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
+Copyright (c) 2006 - 2007, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this 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
 Module Name:\r
 \r
   Variable.h\r
-  \r
+\r
 Abstract:\r
 \r
 --*/\r
@@ -26,16 +26,9 @@ Abstract:
 \r
 //\r
 // BugBug: We need relcate the head file.\r
-// \r
+//\r
 #include <Common/Variable.h>\r
 \r
-#if defined (MDE_CPU_IPF)\r
-#define ALIGNMENT  8\r
-#else\r
-#define ALIGNMENT  1\r
-#endif\r
-\r
-\r
 #define VARIABLE_STORE_SIZE (64 * 1024)\r
 #define SCRATCH_SIZE        (4 * 1024)\r
 \r
@@ -65,10 +58,11 @@ typedef struct {
 typedef struct {\r
   EFI_PHYSICAL_ADDRESS  VolatileVariableBase;\r
   EFI_PHYSICAL_ADDRESS  NonVolatileVariableBase;\r
+  EFI_LOCK              VariableServicesLock;\r
 } VARIABLE_GLOBAL;\r
 \r
 typedef struct {\r
-  VARIABLE_GLOBAL VariableBase[2];\r
+  VARIABLE_GLOBAL VariableGlobal[2];\r
   UINTN           VolatileLastVariableOffset;\r
   UINTN           NonVolatileLastVariableOffset;\r
   UINT32          FvbInstance;\r
@@ -142,7 +136,6 @@ SetVariable (
   )\r
 ;\r
 \r
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
 EFI_STATUS\r
 EFIAPI\r
 QueryVariableInfo (\r
@@ -154,6 +147,5 @@ QueryVariableInfo (
   IN  UINT32                 Instance\r
   )\r
 ;\r
-#endif\r
 \r
 #endif\r