Remove unnecessary use of FixedPcdxxx() functions and [FixedPcd] INF sections. These should only be used for PCDs that are used to pre-init global variables, pre-init global structures, or size arrays.

 

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

2 files changed, 8 insertions, 12 deletions

diff --git a/Nt32Pkg/Sec/SecMain.c b/Nt32Pkg/Sec/SecMain.c
index 21cca57d5d..2c6715d84a 100644
--- a/Nt32Pkg/Sec/SecMain.c
+++ b/Nt32Pkg/Sec/SecMain.c
@@ -1,6 +1,6 @@
 /**@file

 

-Copyright (c) 2006, Intel Corporation

+Copyright (c) 2006 - 2010, 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

@@ -168,8 +168,8 @@ Returns:
   CHAR16                *FirmwareVolumesStr;

   UINTN                 *StackPointer;

 

-  MemorySizeStr      = (CHAR16 *) FixedPcdGetPtr (PcdWinNtMemorySizeForSecMain);

-  FirmwareVolumesStr = (CHAR16 *) FixedPcdGetPtr (PcdWinNtFirmwareVolume);

+  MemorySizeStr      = (CHAR16 *) PcdGetPtr (PcdWinNtMemorySizeForSecMain);

+  FirmwareVolumesStr = (CHAR16 *) PcdGetPtr (PcdWinNtFirmwareVolume);

 

   SecPrint ("\nEDK II SEC Main NT Emulation Environment from www.TianoCore.org\n");

 

@@ -201,7 +201,7 @@ Returns:
   //

   // Setup Boot Mode. If BootModeStr == "" then BootMode = 0 (BOOT_WITH_FULL_CONFIGURATION)

   //

-  SecPrint ("  BootMode 0x%02x\n", FixedPcdGet32 (PcdWinNtBootMode));

+  SecPrint ("  BootMode 0x%02x\n", PcdGet32 (PcdWinNtBootMode));

 

   //

   //  Allocate 128K memory to emulate temp memory for PEI.

@@ -606,7 +606,7 @@ Returns:
   SecCoreData                        = (EFI_SEC_PEI_HAND_OFF*)(UINTN) TopOfStack;

   SecCoreData->DataSize               = sizeof(EFI_SEC_PEI_HAND_OFF);

   SecCoreData->BootFirmwareVolumeBase = (VOID*)BootFirmwareVolumeBase;

-  SecCoreData->BootFirmwareVolumeSize = FixedPcdGet32(PcdWinNtFirmwareFdSize);

+  SecCoreData->BootFirmwareVolumeSize = PcdGet32(PcdWinNtFirmwareFdSize);

   SecCoreData->TemporaryRamBase       = (VOID*)(UINTN)LargestRegion; 

   SecCoreData->TemporaryRamSize       = STACK_SIZE;

   SecCoreData->StackBase              = SecCoreData->TemporaryRamBase;

diff --git a/Nt32Pkg/Sec/SecMain.inf b/Nt32Pkg/Sec/SecMain.inf
index cafa08b41f..1b10a62d75 100644
--- a/Nt32Pkg/Sec/SecMain.inf
+++ b/Nt32Pkg/Sec/SecMain.inf
@@ -3,7 +3,7 @@
 #

 # Main executable file of NT32 Emulator that loads PEI core after initialization finished.

 #

-#  Copyright (c) 2007, Intel Corporation

+#  Copyright (c) 2007 - 2010, 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

@@ -19,8 +19,6 @@
   FILE_GUID                      = 4b837b03-6587-4d19-b82b-edfad836c0a0

   MODULE_TYPE                    = USER_DEFINED

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

-  EFI_SPECIFICATION_VERSION      = 0x00020000

 

 #

 # The following information is for reference only and not required by the build tools.

@@ -28,7 +26,7 @@
 #  VALID_ARCHITECTURES           = IA32

 #

 

-[Sources.common]

+[Sources]

   SecMain.h

   WinNtThunk.c

   FwVol.c

@@ -50,7 +48,6 @@
   PeCoffLib

   ReportStatusCodeLib

 

-

 [Ppis]

   gNtPeiLoadFilePpiGuid                         # PPI ALWAYS_PRODUCED

   gEfiPeiStatusCodePpiGuid                      # PPI ALWAYS_PRODUCED

@@ -59,8 +56,7 @@
   gPeiNtThunkPpiGuid                            # PPI ALWAYS_PRODUCED

   gEfiTemporaryRamSupportPpiGuid

 

-

-[FixedPcd.common]

+[Pcd]

   gEfiNt32PkgTokenSpaceGuid.PcdWinNtBootMode

   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize

   gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySizeForSecMain