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

2 files changed, 12 insertions, 32 deletions

diff --git a/EdkModulePkg/Library/EdkGenericBdsLib/DevicePath.c b/EdkModulePkg/Library/EdkGenericBdsLib/DevicePath.c
index f0debd5..253f2a9 100644
--- a/EdkModulePkg/Library/EdkGenericBdsLib/DevicePath.c
+++ b/EdkModulePkg/Library/EdkGenericBdsLib/DevicePath.c
@@ -877,14 +877,6 @@ DEVICE_PATH_STRING_TABLE  DevPathTable[] = {
     DevPathMediaProtocol

   },
 

-#if (EFI_SPECIFICATION_VERSION < 0x00020000)

-  {
-    MEDIA_DEVICE_PATH,

-    MEDIA_FV_FILEPATH_DP,

-    DevPathFvFilePath

-  },
-#endif

-

   {
     BBS_DEVICE_PATH,

     BBS_BBS_DP,

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeService.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeService.c
index 013c3f1..e9a539d 100644
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeService.c
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeService.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:

 

@@ -62,7 +62,7 @@ EfiGetTime (
 

 Routine Description:

 

-  Returns the current time and date information, and the time-keeping 

+  Returns the current time and date information, and the time-keeping

   capabilities of the hardware platform.

 

 Arguments:

@@ -214,11 +214,11 @@ Arguments:
 

   VariableNameSize  - The size of the VariableName buffer.

   VariableName      - On input, supplies the last VariableName that was returned

-                      by GetNextVariableName(). 

+                      by GetNextVariableName().

                       On output, returns the Nullterminated Unicode string of the

                       current variable.

   VendorGuid        - On input, supplies the last VendorGuid that was returned by

-                      GetNextVariableName(). 

+                      GetNextVariableName().

                       On output, returns the VendorGuid of the current variable.

 

 Returns:

@@ -332,7 +332,7 @@ Arguments:
 

   ListHead         - Head of linked list to convert

 

-Returns: 

+Returns:

 

   EFI_SUCCESS

 

@@ -411,15 +411,11 @@ EfiUpdateCapsule (
   IN EFI_PHYSICAL_ADDRESS	ScatterGatherList	OPTIONAL

   )

 {

-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)

   return mRT->UpdateCapsule (

                 CapsuleHeaderArray,

                 CapsuleCount,

                 ScatterGatherList

                 );

-#else

-  return EFI_UNSUPPORTED;

-#endif

 }

 

 EFI_STATUS

@@ -431,16 +427,12 @@ EfiQueryCapsuleCapabilities (
   OUT EFI_RESET_TYPE		*ResetType

   )

 {

-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)

   return mRT->QueryCapsuleCapabilities (

           CapsuleHeaderArray,

           CapsuleCount,

           MaximumCapsuleSize,

           ResetType

           );

-#else

-  return EFI_UNSUPPORTED;

-#endif

 }

 

 

@@ -453,14 +445,10 @@ EfiQueryVariableInfo (
   OUT UINT64			*MaximumVariableSize

   )

 {

-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)

   return mRT->QueryVariableInfo (

           Attributes,

           MaximumVariableStorageSize,

           RemainingVariableStorageSize,

           MaximumVariableSize

           );

-#else 

-  return EFI_UNSUPPORTED;

-#endif

 }