Add new interface GetVariable2 and GetEfiGlobalVariable2 to return more info. Also replace old interface with new one.

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

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

5 files changed, 12 insertions, 12 deletions

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiString.c b/MdeModulePkg/Library/UefiHiiLib/HiiString.c
index 6b1ec2d70..4cc7b802c 100644
--- a/MdeModulePkg/Library/UefiHiiLib/HiiString.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiString.c
@@ -1,7 +1,7 @@
 /** @file

   HII Library implementation that uses DXE protocols and services.

 

-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

   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

@@ -250,7 +250,7 @@ HiiGetString (
   //

   // Get the current platform language setting

   //

-  PlatformLanguage = GetEfiGlobalVariable (L"PlatformLang");

+  GetEfiGlobalVariable2 (L"PlatformLang", &PlatformLanguage, NULL);

 

   //

   // If Languag is NULL, then set it to an empty string, so it will be 

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
index 6a65731ac..008e746b3 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
@@ -2,7 +2,7 @@
   Produces Simple Text Input Protocol, Simple Text Input Extended Protocol and

   Simple Text Output Protocol upon Serial IO Protocol.

 

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 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

@@ -358,7 +358,7 @@ IsTerminalInConsoleVariable (
   //

   // Get global variable and its size according to the name given.

   //

-  Variable = GetEfiGlobalVariable (VariableName);

+  GetEfiGlobalVariable2 (VariableName, &Variable, NULL);

   if (Variable == NULL) {

     return FALSE;

   }

@@ -1431,7 +1431,7 @@ TerminalUpdateConsoleDevVariable (
   //

   // Get global variable and its size according to the name given.

   //

-  Variable = GetEfiGlobalVariable (VariableName);

+  GetEfiGlobalVariable2 (VariableName, &Variable, NULL);

   if (Variable == NULL) {

     return;

   }

@@ -1500,7 +1500,7 @@ TerminalRemoveConsoleDevVariable (
   //

   // Get global variable and its size according to the name given.

   //

-  Variable = GetEfiGlobalVariable (VariableName);

+  GetEfiGlobalVariable2 (VariableName, &Variable, NULL);

   if (Variable == NULL) {

     return ;

   }

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
index 66fc6b978..93857bd11 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
@@ -2368,7 +2368,7 @@ HiiStringIdToImage (
   if (Language == NULL) {

     Language = "";

   }

-  CurrentLanguage = GetEfiGlobalVariable (L"PlatformLang");

+  GetEfiGlobalVariable2 (L"PlatformLang", &CurrentLanguage, NULL);

   BestLanguage = GetBestLanguage (

                    SupportedLanguages,

                    FALSE,

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c
index f283db019..27ee99219 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/NicIp4Variable.c
@@ -1,7 +1,7 @@
 /** @file

   Routines used to operate the Ip4 configure variable.

 

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

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

@@ -91,7 +91,7 @@ Ip4ConfigReadVariable (
 {

   NIC_IP4_CONFIG_INFO *NicConfig;

 

-  NicConfig = GetVariable (Instance->MacString, &gEfiNicIp4ConfigVariableGuid);

+  GetVariable2 (Instance->MacString, &gEfiNicIp4ConfigVariableGuid, &NicConfig, NULL);

   if (NicConfig != NULL) {

     Ip4ConfigFixRouteTablePointer (&NicConfig->Ip4Info);

   }

@@ -255,7 +255,7 @@ Check:
       continue;

     }

 

-    NicConfig = GetVariable (VariableName, &gEfiNicIp4ConfigVariableGuid);

+    GetVariable2 (VariableName, &gEfiNicIp4ConfigVariableGuid, &NicConfig, NULL);

     if (NicConfig == NULL) {

       break;

     }

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c
index ab8a000f1..1c2b02f5a 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c
@@ -13,7 +13,7 @@
   4. It save all the mapping info in NV variables which will be consumed

      by platform override protocol driver to publish the platform override protocol.

 

-Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>

 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

@@ -185,7 +185,7 @@ GetComponentNameWorker (
   //

   // Find the best matching language.

   //

-  Language = GetEfiGlobalVariable (VariableName);

+  GetEfiGlobalVariable2 (VariableName, &Language, NULL);

   BestLanguage = GetBestLanguage (

                    ComponentName->SupportedLanguages,

                    (BOOLEAN) (ProtocolGuid == &gEfiComponentNameProtocolGuid),