1. Removed #ifdef EDK_RELEASE_VERSION from all c files for all modules

2. Removed #ifdef EFI_SPECIFICATION_VERSION from all c files for all modules
3. Added comments for file VariableWorker.c

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

4 files changed, 33 insertions, 45 deletions

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
index 8695b75..741116a 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
@@ -27,7 +27,7 @@ Revision History
 ESAL_VARIABLE_GLOBAL  *mVariableModuleGlobal;

 

 //

-// This is a temperary function which will be removed 

+// This is a temperary function which will be removed

 // when EfiAcquireLock in UefiLib can handle the

 // the call in UEFI Runtimer driver in RT phase.

 //

@@ -43,7 +43,7 @@ AcquireLockOnlyAtBootTime (
 }

 

 //

-// This is a temperary function which will be removed 

+// This is a temperary function which will be removed

 // when EfiAcquireLock in UefiLib can handle the

 // the call in UEFI Runtimer driver in RT phase.

 //

@@ -426,7 +426,7 @@ Returns:
 Done:

   ReleaseLockOnlyAtBootTime (&Global->VariableServicesLock);

   return Status;

- 

+

 }

 

 EFI_STATUS

@@ -485,8 +485,8 @@ Returns:
     goto Done;

   } else if (!EFI_ERROR (Status) && Variable.Volatile && EfiAtRuntime()) {

     //

-    // If EfiAtRuntime and the variable is Volatile and Runtime Access,  

-    // the volatile is ReadOnly, and SetVariable should be aborted and 

+    // If EfiAtRuntime and the variable is Volatile and Runtime Access,

+    // the volatile is ReadOnly, and SetVariable should be aborted and

     // return EFI_WRITE_PROTECTED.

     //

     Status = EFI_WRITE_PROTECTED;

@@ -622,7 +622,6 @@ Done:
   return Status;

 }

 

-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)

 EFI_STATUS

 EFIAPI

 QueryVariableInfo (

@@ -693,7 +692,7 @@ Returns:
   }

 

   AcquireLockOnlyAtBootTime(&Global->VariableServicesLock);

-  

+

   if((Attributes & EFI_VARIABLE_NON_VOLATILE) == 0) {

     //

     // Query is Volatile related.

@@ -747,7 +746,6 @@ Returns:
   ReleaseLockOnlyAtBootTime (&Global->VariableServicesLock);

   return EFI_SUCCESS;

 }

-#endif

 

 STATIC

 EFI_STATUS

@@ -827,7 +825,7 @@ Returns:
   }

 

   EfiInitializeLock(&mVariableModuleGlobal->VariableGlobal[Physical].VariableServicesLock, EFI_TPL_NOTIFY);

-  

+

   //

   // Intialize volatile variable store

   //

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/InitVariable.c b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/InitVariable.c
index 570ba72..efff41c 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/InitVariable.c
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/InitVariable.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c) 2006 - 2007, Intel Corporation                                                         

-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        

-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.             

+Copyright (c) 2006 - 2007, Intel Corporation

+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

+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:

 

@@ -114,7 +114,6 @@ Returns:
           );

 }

 

-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)

 EFI_STATUS

 EFIAPI

 RuntimeServiceQueryVariableInfo (

@@ -142,7 +141,6 @@ Returns:
           mVariableModuleGlobal->FvbInstance

           );

 }

-#endif

 

 VOID

 EFIAPI

@@ -196,9 +194,7 @@ Returns:
   SystemTable->RuntimeServices->GetVariable         = RuntimeServiceGetVariable;

   SystemTable->RuntimeServices->GetNextVariableName = RuntimeServiceGetNextVariableName;

   SystemTable->RuntimeServices->SetVariable         = RuntimeServiceSetVariable;

-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)

   SystemTable->RuntimeServices->QueryVariableInfo   = RuntimeServiceQueryVariableInfo;

-#endif

 

   //

   // Now install the Variable Runtime Architectural Protocol on a new handle

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
index cbf5aec..a7cb5f6 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

-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        

-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.             

+Copyright (c) 2006 - 2007, Intel Corporation

+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

+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:

 

@@ -89,7 +89,6 @@ Returns:
                         );

     return ReturnVal;

 

-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)

   case EsalQueryVariableInfo:

     ReturnVal.Status = QueryVariableInfo (

                         (UINT32) Arg2,

@@ -100,7 +99,6 @@ Returns:
                         Global->FvbInstance

                         );

     return ReturnVal;

-#endif

 

   default:

     ReturnVal.Status = EFI_SAL_INVALID_ARGUMENT;

@@ -173,10 +171,8 @@ Returns:
     EsalGetNextVariableName,

     EsalVariableCommonEntry,

     EsalSetVariable,

-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)

     EsalVariableCommonEntry,

     EsalQueryVariableInfo,

-#endif

     NULL

     );

 

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Variable.h b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Variable.h
index 4c2a468..67c284f 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Variable.h
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Variable.h
@@ -1,18 +1,18 @@
 /*++

 

-Copyright (c) 2006 - 2007, Intel Corporation                                                         

-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        

-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.             

+Copyright (c) 2006 - 2007, Intel Corporation

+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

+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:

 

   Variable.h

-  

+

 Abstract:

 

 --*/

@@ -26,7 +26,7 @@ Abstract:
 

 //

 // BugBug: We need relcate the head file.

-// 

+//

 #include <Common/Variable.h>

 

 #if defined (MDE_CPU_IPF)

@@ -143,7 +143,6 @@ SetVariable (
   )

 ;

 

-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)

 EFI_STATUS

 EFIAPI

 QueryVariableInfo (

@@ -155,6 +154,5 @@ QueryVariableInfo (
   IN  UINT32                 Instance

   )

 ;

-#endif

 

 #endif