1) Change the alignment from 1 to 2 for IA32 and X64 arch.

2) Move ALIGNMENT macro to common variable.h file.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2538 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkModulePkg/Include/Common/Variable.h b/EdkModulePkg/Include/Common/Variable.h
index e75adafc1223e3f630fe76643ac54c8217e23796..08334b72236741df222d0c0e92d9905aebda481f 100644 (file)
--- a/EdkModulePkg/Include/Common/Variable.h
+++ b/EdkModulePkg/Include/Common/Variable.h
@@ -1,6 +1,7 @@
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation                                                         \r
+/**@file\r
+       Header file for EFI Variable Services.\r
+       \r
+Copyright (c) 2006 - 2007 Intel Corporation. <BR>\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
 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


@@ -9,15 +10,7 @@ http://opensource.org/licenses/bsd-license.php
 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
 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
-  EfiVariable.h\r
-  \r
-Abstract:\r
-  \r
-  Header file for EFI Variable Services\r
-\r
---*/\r
+**/\r

 \r
 #ifndef _EFI_VARIABLE_H_\r
 #define _EFI_VARIABLE_H_\r
 \r
 #ifndef _EFI_VARIABLE_H_\r
 #define _EFI_VARIABLE_H_\r


@@ -34,6 +27,15 @@ Abstract:
 #define VARIABLE_STORE_FORMATTED  0x5a\r
 #define VARIABLE_STORE_HEALTHY    0xfe\r
 \r
 #define VARIABLE_STORE_FORMATTED  0x5a\r
 #define VARIABLE_STORE_HEALTHY    0xfe\r
 \r

+//\r
+// The alignment of variable's start offset.\r
+//\r
+#if defined (MDE_CPU_IPF)\r
+#define ALIGNMENT  8\r
+#else\r
+#define ALIGNMENT  2\r
+#endif\r
+\r

 //\r
 // Variable Store Status\r
 //\r
 //\r
 // Variable Store Status\r
 //\r

diff --git a/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h b/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h
index 83031e9788fbe68098334aa47fbf9390116b8ba6..b83b8f6d7dd32563707cfc071b93cec6121b57f9 100644 (file)
--- a/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h
+++ b/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h
@@ -1,6 +1,7 @@
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation                                                         \r
+/**@file\r
+  Variable Machine Type\r
+  \r
+Copyright (c) 2006 - 2007 Intel Corporation. <BR>\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
 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


@@ -9,19 +10,10 @@ http://opensource.org/licenses/bsd-license.php
 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
 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
-  VarMachine.h\r
-  \r
-Abstract:\r
-\r
-  Variable Machine Type\r
-\r
---*/\r
+**/\r

 \r
 #ifndef _VAR_MACHINE_H\r
 #define _VAR_MACHINE_H\r
 \r
 \r
 #ifndef _VAR_MACHINE_H\r
 #define _VAR_MACHINE_H\r
 \r

-#define ALIGNMENT 1\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/EdkModulePkg/Universal/Variable/Pei/Ia32/VarMachine.h b/EdkModulePkg/Universal/Variable/Pei/Ia32/VarMachine.h
index 83031e9788fbe68098334aa47fbf9390116b8ba6..7a79ab6bc76548adc6e0bf1b8a67d3604fc6fbd1 100644 (file)
--- a/EdkModulePkg/Universal/Variable/Pei/Ia32/VarMachine.h
+++ b/EdkModulePkg/Universal/Variable/Pei/Ia32/VarMachine.h
@@ -1,6 +1,7 @@
-/*++\r
+/**@file\r
+  Variable Machine Type\r

 \r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007 Intel Corporation. <BR>\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
 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


@@ -9,19 +10,10 @@ http://opensource.org/licenses/bsd-license.php
 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
 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
-  VarMachine.h\r
-  \r
-Abstract:\r
-\r
-  Variable Machine Type\r
-\r
---*/\r
+**/\r

 \r
 #ifndef _VAR_MACHINE_H\r
 #define _VAR_MACHINE_H\r
 \r
 \r
 #ifndef _VAR_MACHINE_H\r
 #define _VAR_MACHINE_H\r
 \r

-#define ALIGNMENT 1\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/EdkModulePkg/Universal/Variable/Pei/Ipf/VarMachine.h b/EdkModulePkg/Universal/Variable/Pei/Ipf/VarMachine.h
index c5b5753f9e4782883aa5a633076b35af2354fd61..166c07fe4fe5b04671de8cded23f8da95d409e1a 100644 (file)
--- a/EdkModulePkg/Universal/Variable/Pei/Ipf/VarMachine.h
+++ b/EdkModulePkg/Universal/Variable/Pei/Ipf/VarMachine.h
@@ -1,6 +1,7 @@
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation                                                         \r
+/**@file\r
+  Variable Machine Type\r
+  \r
+Copyright (c) 2006 - 2007 Intel Corporation. <BR>\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
 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


@@ -9,19 +10,11 @@ http://opensource.org/licenses/bsd-license.php
 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
 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
-  VarMachine.h\r
-  \r
-Abstract:\r
-\r
-  Variable Machine Type\r
-\r
---*/\r
+**/\r

 \r
 #ifndef _VAR_MACHINE_H\r
 #define _VAR_MACHINE_H\r
 \r
 \r
 #ifndef _VAR_MACHINE_H\r
 #define _VAR_MACHINE_H\r
 \r

-#define ALIGNMENT 8\r
+\r

 \r
 #endif\r
 \r
 #endif\r

diff --git a/EdkModulePkg/Universal/Variable/Pei/x64/VarMachine.h b/EdkModulePkg/Universal/Variable/Pei/x64/VarMachine.h
index 83031e9788fbe68098334aa47fbf9390116b8ba6..dc1c7b43fa6b732ad1684209f087a597c920c763 100644 (file)
--- a/EdkModulePkg/Universal/Variable/Pei/x64/VarMachine.h
+++ b/EdkModulePkg/Universal/Variable/Pei/x64/VarMachine.h
@@ -1,6 +1,7 @@
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation                                                         \r
+/**@file\r
+  Variable Machine Type\r
+  \r
+Copyright (c) 2006 - 2007 Intel Corporation. <BR>\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
 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


@@ -9,19 +10,9 @@ http://opensource.org/licenses/bsd-license.php
 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
 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
-  VarMachine.h\r
-  \r
-Abstract:\r
-\r
-  Variable Machine Type\r
-\r
---*/\r
+**/\r

 \r
 #ifndef _VAR_MACHINE_H\r
 #define _VAR_MACHINE_H\r
 \r
 \r
 #ifndef _VAR_MACHINE_H\r
 #define _VAR_MACHINE_H\r
 \r

-#define ALIGNMENT 1\r
-\r

 #endif\r
 #endif\r

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.h b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.h
index bb781b4c5b0efbe2788595473acc0819fe4f11e2..51090abb53510221880116c32c4a292636c5cc08 100644 (file)
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.h
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.h
@@ -29,12 +29,6 @@ Abstract:
 //\r
 #include <Common/Variable.h>\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

 #define VARIABLE_RECLAIM_THRESHOLD (1024)\r
 \r
 #define VARIABLE_STORE_SIZE (64 * 1024)\r
 #define VARIABLE_RECLAIM_THRESHOLD (1024)\r
 \r
 #define VARIABLE_STORE_SIZE (64 * 1024)\r