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

6 files changed, 34 insertions, 70 deletions

diff --git a/EdkModulePkg/Include/Common/Variable.h b/EdkModulePkg/Include/Common/Variable.h
index e75adafc12..08334b7223 100644
--- a/EdkModulePkg/Include/Common/Variable.h
+++ b/EdkModulePkg/Include/Common/Variable.h
@@ -1,6 +1,7 @@
-/*++

-

-Copyright (c) 2006, Intel Corporation                                                         

+/**@file

+	Header file for EFI Variable Services.

+	

+Copyright (c) 2006 - 2007 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        

@@ -9,15 +10,7 @@ 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.             

 

-Module Name:

-

-  EfiVariable.h

-  

-Abstract:

-  

-  Header file for EFI Variable Services

-

---*/

+**/

 

 #ifndef _EFI_VARIABLE_H_

 #define _EFI_VARIABLE_H_

@@ -35,6 +28,15 @@ Abstract:
 #define VARIABLE_STORE_HEALTHY    0xfe

 

 //

+// The alignment of variable's start offset.

+//

+#if defined (MDE_CPU_IPF)

+#define ALIGNMENT  8

+#else

+#define ALIGNMENT  2

+#endif

+

+//

 // Variable Store Status

 //

 typedef enum {

diff --git a/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h b/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h
index 83031e9788..b83b8f6d7d 100644
--- a/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h
+++ b/EdkModulePkg/Universal/Variable/Pei/Ebc/VarMachine.h
@@ -1,6 +1,7 @@
-/*++

-

-Copyright (c) 2006, Intel Corporation                                                         

+/**@file

+  Variable Machine Type

+  

+Copyright (c) 2006 - 2007 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        

@@ -9,19 +10,10 @@ 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.             

 

-Module Name:

-

-  VarMachine.h

-  

-Abstract:

-

-  Variable Machine Type

-

---*/

+**/

 

 #ifndef _VAR_MACHINE_H

 #define _VAR_MACHINE_H

 

-#define ALIGNMENT 1

 

 #endif

diff --git a/EdkModulePkg/Universal/Variable/Pei/Ia32/VarMachine.h b/EdkModulePkg/Universal/Variable/Pei/Ia32/VarMachine.h
index 83031e9788..7a79ab6bc7 100644
--- a/EdkModulePkg/Universal/Variable/Pei/Ia32/VarMachine.h
+++ b/EdkModulePkg/Universal/Variable/Pei/Ia32/VarMachine.h
@@ -1,6 +1,7 @@
-/*++

+/**@file

+  Variable Machine Type

 

-Copyright (c) 2006, Intel Corporation                                                         

+Copyright (c) 2006 - 2007 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        

@@ -9,19 +10,10 @@ 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.             

 

-Module Name:

-

-  VarMachine.h

-  

-Abstract:

-

-  Variable Machine Type

-

---*/

+**/

 

 #ifndef _VAR_MACHINE_H

 #define _VAR_MACHINE_H

 

-#define ALIGNMENT 1

 

 #endif

diff --git a/EdkModulePkg/Universal/Variable/Pei/Ipf/VarMachine.h b/EdkModulePkg/Universal/Variable/Pei/Ipf/VarMachine.h
index c5b5753f9e..166c07fe4f 100644
--- a/EdkModulePkg/Universal/Variable/Pei/Ipf/VarMachine.h
+++ b/EdkModulePkg/Universal/Variable/Pei/Ipf/VarMachine.h
@@ -1,6 +1,7 @@
-/*++

-

-Copyright (c) 2006, Intel Corporation                                                         

+/**@file

+  Variable Machine Type

+  

+Copyright (c) 2006 - 2007 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        

@@ -9,19 +10,11 @@ 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.             

 

-Module Name:

-

-  VarMachine.h

-  

-Abstract:

-

-  Variable Machine Type

-

---*/

+**/

 

 #ifndef _VAR_MACHINE_H

 #define _VAR_MACHINE_H

 

-#define ALIGNMENT 8

+

 

 #endif

diff --git a/EdkModulePkg/Universal/Variable/Pei/x64/VarMachine.h b/EdkModulePkg/Universal/Variable/Pei/x64/VarMachine.h
index 83031e9788..dc1c7b43fa 100644
--- a/EdkModulePkg/Universal/Variable/Pei/x64/VarMachine.h
+++ b/EdkModulePkg/Universal/Variable/Pei/x64/VarMachine.h
@@ -1,6 +1,7 @@
-/*++

-

-Copyright (c) 2006, Intel Corporation                                                         

+/**@file

+  Variable Machine Type

+  

+Copyright (c) 2006 - 2007 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        

@@ -9,19 +10,9 @@ 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.             

 

-Module Name:

-

-  VarMachine.h

-  

-Abstract:

-

-  Variable Machine Type

-

---*/

+**/

 

 #ifndef _VAR_MACHINE_H

 #define _VAR_MACHINE_H

 

-#define ALIGNMENT 1

-

 #endif

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.h b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.h
index bb781b4c5b..51090abb53 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.h
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.h
@@ -29,12 +29,6 @@ Abstract:
 //

 #include <Common/Variable.h>

 

-#if defined (MDE_CPU_IPF)

-#define ALIGNMENT  8

-#else

-#define ALIGNMENT  1

-#endif

-

 #define VARIABLE_RECLAIM_THRESHOLD (1024)

 

 #define VARIABLE_STORE_SIZE (64 * 1024)