Convert NT32 to use PCD settings for UEFI Timeout and language variables as a POC for new BDS.

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

3 files changed, 10 insertions, 12 deletions

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
index 13ec89f501..9fa05ffd6d 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
@@ -25,7 +25,7 @@ Abstract:
 #define MAX_STRING_LEN        200

 static BOOLEAN   mFeaturerSwitch = TRUE;

 static BOOLEAN   mResetRequired  = FALSE;

-extern UINT16 gPlatformBootTimeOutDefault;

+

 

 UINT16

 BdsLibGetTimeout (

@@ -66,7 +66,7 @@ Returns:
   // present.

   // This code should be removed later.

   //

-  Timeout = gPlatformBootTimeOutDefault;

+  Timeout = PcdGet16 (PcdUefiVariableDefaultTimeout);

 

   //

   // Notes: Platform should set default variable if non exists on all error cases!!!

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
index ca25796624..b4d579f36e 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.inf
@@ -63,6 +63,7 @@
   DxeServicesTableLib

   UefiLib

   BaseLib

+  PcdLib

 

 [Guids]

   gEfiGlobalVariableGuid                        # ALWAYS_CONSUMED

@@ -85,3 +86,5 @@
   gEfiFirmwareVolumeProtocolGuid                # PROTOCOL SOMETIMES_CONSUMED

   gEfiLoadedImageProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED

 

+[PcdsFixedAtBuild.common]

+  PcdUefiVariableDefaultTimeout|gEfiMdePkgTokenSpaceGuid

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h
index 9d07a5c88b..2b49ce4fe6 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLibInternal.h
@@ -21,20 +21,14 @@
 //

 #include <PiDxe.h>

 #include <WinNtDxe.h>

-//

-// The protocols, PPI and GUID defintions for this module

-//

 #include <Protocol/Cpu.h>

 #include <Protocol/SimpleTextIn.h>

 #include <Protocol/SimpleTextOut.h>

 #include <Protocol/LoadedImage.h>

-#include <Guid/GenericPlatformVariable.h>

-#include <Guid/ShellFile.h>

 #include <Protocol/SimpleFileSystem.h>

 #include <Protocol/BlockIo.h>

 #include <Protocol/SimpleNetwork.h>

 #include <Protocol/AcpiS3Save.h>

-#include <Guid/GlobalVariable.h>

 #include <Protocol/FormBrowserFramework.h>

 #include <Protocol/LegacyBios.h>

 #include <Protocol/DriverBinding.h>

@@ -44,10 +38,9 @@
 #include <Protocol/Performance.h>

 #include <Protocol/WinNtIo.h>

 #include <Guid/PcAnsi.h>

-

-//

-// The Library classes this module consumes

-//

+#include <Guid/GlobalVariable.h>

+#include <Guid/GenericPlatformVariable.h>

+#include <Guid/ShellFile.h>

 #include <Library/EdkGenericBdsLib.h>

 #include <Library/BaseLib.h>

 #include <Library/UefiLib.h>

@@ -62,6 +55,8 @@
 #include <Library/DevicePathLib.h>

 #include <Library/PerformanceLib.h>

 #include <Library/PeCoffLib.h>

+#include <Library/PcdLib.h>

+

 

 #define PERF_TOKEN_LENGTH       28

 #define PERF_PEI_ENTRY_MAX_NUM  50