Remove R2627 commit. Roll back R2626.

[mirror_edk2.git] / EdkModulePkg / Universal / EmuVariable / RuntimeDxe / Ipf / InitVariable.c

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
index ee2a4852a078220d9c31f20f0d81fe7df253bb60..a7cb5f68c9e6589cd3a0ff9b503be04932cf1514 100644 (file)
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
@@ -1,13 +1,13 @@
 /*++\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
@@ -24,8 +24,8 @@ Revision History
 //\r
 // Don't use module globals after the SetVirtualAddress map is signaled\r
 //\r
-extern ESAL_VARIABLE_GLOBAL *mVariableModuleGlobal;\r
 \r
+STATIC\r
 SAL_RETURN_REGS\r
 EsalVariableCommonEntry (\r
   IN  UINT64                                      FunctionId,\r
@@ -60,7 +60,7 @@ Returns:
                         (UINT32 *) Arg4,\r
                         (UINTN *) Arg5,\r
                         (VOID *) Arg6,\r
-                        &Global->VariableBase[VirtualMode],\r
+                        &Global->VariableGlobal[VirtualMode],\r
                         Global->FvbInstance\r
                         );\r
     return ReturnVal;\r
@@ -70,7 +70,7 @@ Returns:
                         (UINTN *) Arg2,\r
                         (CHAR16 *) Arg3,\r
                         (EFI_GUID *) Arg4,\r
-                        &Global->VariableBase[VirtualMode],\r
+                        &Global->VariableGlobal[VirtualMode],\r
                         Global->FvbInstance\r
                         );\r
     return ReturnVal;\r
@@ -82,25 +82,23 @@ Returns:
                         (UINT32) Arg4,\r
                         (UINTN) Arg5,\r
                         (VOID *) Arg6,\r
-                        &Global->VariableBase[VirtualMode],\r
+                        &Global->VariableGlobal[VirtualMode],\r
                         (UINTN *) &Global->VolatileLastVariableOffset,\r
                         (UINTN *) &Global->NonVolatileLastVariableOffset,\r
                         Global->FvbInstance\r
                         );\r
     return ReturnVal;\r
 \r
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
   case EsalQueryVariableInfo:\r
     ReturnVal.Status = QueryVariableInfo (\r
                         (UINT32) Arg2,\r
                         (UINT64 *) Arg3,\r
                         (UINT64 *) Arg4,\r
                         (UINT64 *) Arg5,\r
-                        &Global->VariableBase[VirtualMode],\r
+                        &Global->VariableGlobal[VirtualMode],\r
                         Global->FvbInstance\r
                         );\r
     return ReturnVal;\r
-#endif\r
 \r
   default:\r
     ReturnVal.Status = EFI_SAL_INVALID_ARGUMENT;\r
@@ -125,18 +123,18 @@ Returns:
 --*/\r
 {\r
   CopyMem (\r
-    &mVariableModuleGlobal->VariableBase[Virtual],\r
-    &mVariableModuleGlobal->VariableBase[Physical],\r
+    &mVariableModuleGlobal->VariableGlobal[Virtual],\r
+    &mVariableModuleGlobal->VariableGlobal[Physical],\r
     sizeof (VARIABLE_GLOBAL)\r
     );\r
 \r
   EfiConvertPointer (\r
     0x0,\r
-    (VOID **) &mVariableModuleGlobal->VariableBase[Virtual].NonVolatileVariableBase\r
+    (VOID **) &mVariableModuleGlobal->VariableGlobal[Virtual].NonVolatileVariableBase\r
     );\r
   EfiConvertPointer (\r
     0x0,\r
-    (VOID **) &mVariableModuleGlobal->VariableBase[Virtual].VolatileVariableBase\r
+    (VOID **) &mVariableModuleGlobal->VariableGlobal[Virtual].VolatileVariableBase\r
     );\r
   EfiConvertPointer (0x0, (VOID **) &mVariableModuleGlobal);\r
 }\r
@@ -173,10 +171,8 @@ Returns:
     EsalGetNextVariableName,\r
     EsalVariableCommonEntry,\r
     EsalSetVariable,\r
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
     EsalVariableCommonEntry,\r
     EsalQueryVariableInfo,\r
-#endif\r
     NULL\r
     );\r
 \r