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
This commit is contained in:
mdkinney 2010-01-29 23:30:55 +00:00
parent d5b0f232f7
commit f7c58a94cf
7 changed files with 35 additions and 65 deletions

View File

@ -3,7 +3,7 @@
# #
# This DXE runtime driver implements and produces the Fimware Volue Block Protocol on # This DXE runtime driver implements and produces the Fimware Volue Block Protocol on
# NT32 emulator. # NT32 emulator.
# Copyright (c) 2006 - 2007, Intel Corporation # Copyright (c) 2006 - 2010, Intel Corporation
# #
# All rights reserved. This program and the accompanying materials # All rights reserved. This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -21,9 +21,6 @@
FILE_GUID = BDFE5FAA-2A35-44bb-B17A-8084D4E2B9E9 FILE_GUID = BDFE5FAA-2A35-44bb-B17A-8084D4E2B9E9
MODULE_TYPE = DXE_RUNTIME_DRIVER MODULE_TYPE = DXE_RUNTIME_DRIVER
VERSION_STRING = 1.0 VERSION_STRING = 1.0
EDK_RELEASE_VERSION = 0x00020000
EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = FvbInitialize ENTRY_POINT = FvbInitialize
# #
@ -32,18 +29,16 @@
# VALID_ARCHITECTURES = IA32 # VALID_ARCHITECTURES = IA32
# #
[Sources.common] [Sources]
FvbInfo.c FvbInfo.c
FwBlockService.h FwBlockService.h
FWBlockService.c FWBlockService.c
[Packages] [Packages]
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec MdeModulePkg/MdeModulePkg.dec
Nt32Pkg/Nt32Pkg.dec Nt32Pkg/Nt32Pkg.dec
[LibraryClasses] [LibraryClasses]
UefiBootServicesTableLib UefiBootServicesTableLib
MemoryAllocationLib MemoryAllocationLib
@ -57,7 +52,6 @@
UefiLib UefiLib
PcdLib PcdLib
[Guids] [Guids]
gEfiEventVirtualAddressChangeGuid # ALWAYS_CONSUMED Create Event: EVENT_GROUP_GUID gEfiEventVirtualAddressChangeGuid # ALWAYS_CONSUMED Create Event: EVENT_GROUP_GUID
@ -65,23 +59,22 @@
gEfiFirmwareVolumeBlockProtocolGuid # PROTOCOL ALWAYS_PRODUCED gEfiFirmwareVolumeBlockProtocolGuid # PROTOCOL ALWAYS_PRODUCED
gEfiDevicePathProtocolGuid # PROTOCOL SOMETIMES_PRODUCED gEfiDevicePathProtocolGuid # PROTOCOL SOMETIMES_PRODUCED
[FixedPcd.common] [FixedPcd]
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareBlockSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareBlockSize
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize
[Pcd.common] [Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase
[depex] [Depex]
TRUE TRUE

View File

@ -5,7 +5,7 @@
# All .uni file who tagged with "ToolCode="DUMMY"" in following file list is included by # All .uni file who tagged with "ToolCode="DUMMY"" in following file list is included by
# MiscSubclassDriver.uni file, the StrGather tool will expand MiscSubclassDriver.uni file # MiscSubclassDriver.uni file, the StrGather tool will expand MiscSubclassDriver.uni file
# and parse all .uni file. # and parse all .uni file.
# Copyright (c) 2006 - 2009, Intel Corporation # Copyright (c) 2006 - 2010, Intel Corporation
# #
# All rights reserved. This program and the accompanying materials # All rights reserved. This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -23,9 +23,6 @@
FILE_GUID = 4A9B9DB8-EC62-4A92-818F-8AA0246D246E FILE_GUID = 4A9B9DB8-EC62-4A92-818F-8AA0246D246E
MODULE_TYPE = DXE_DRIVER MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0 VERSION_STRING = 1.0
EDK_RELEASE_VERSION = 0x00020000
EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = MiscSubclassDriverEntryPoint ENTRY_POINT = MiscSubclassDriverEntryPoint
# #
@ -34,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 # VALID_ARCHITECTURES = IA32
# #
[Sources.common] [Sources]
MiscBaseBoardManufacturerData.c MiscBaseBoardManufacturerData.c
MiscBaseBoardManufacturerFunction.c MiscBaseBoardManufacturerFunction.c
MiscBiosVendorData.c MiscBiosVendorData.c
@ -72,7 +69,6 @@
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
Nt32Pkg/Nt32Pkg.dec Nt32Pkg/Nt32Pkg.dec
[LibraryClasses] [LibraryClasses]
DevicePathLib DevicePathLib
UefiBootServicesTableLib UefiBootServicesTableLib
@ -89,11 +85,9 @@
gEfiWinNtIoProtocolGuid # PROTOCOL_NOTIFY SOMETIMES_CONSUMED gEfiWinNtIoProtocolGuid # PROTOCOL_NOTIFY SOMETIMES_CONSUMED
gEfiSmbiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiSmbiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED
[FixedPcd.common] [Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareReleaseDateString gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareReleaseDateString
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString
[Pcd.common]
gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize
gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang

View File

@ -1,6 +1,6 @@
/**@file /**@file
Copyright (c) 2006, Intel Corporation Copyright (c) 2006 - 2010, Intel Corporation
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -168,8 +168,8 @@ Returns:
CHAR16 *FirmwareVolumesStr; CHAR16 *FirmwareVolumesStr;
UINTN *StackPointer; UINTN *StackPointer;
MemorySizeStr = (CHAR16 *) FixedPcdGetPtr (PcdWinNtMemorySizeForSecMain); MemorySizeStr = (CHAR16 *) PcdGetPtr (PcdWinNtMemorySizeForSecMain);
FirmwareVolumesStr = (CHAR16 *) FixedPcdGetPtr (PcdWinNtFirmwareVolume); FirmwareVolumesStr = (CHAR16 *) PcdGetPtr (PcdWinNtFirmwareVolume);
SecPrint ("\nEDK II SEC Main NT Emulation Environment from www.TianoCore.org\n"); 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) // 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. // Allocate 128K memory to emulate temp memory for PEI.
@ -606,7 +606,7 @@ Returns:
SecCoreData = (EFI_SEC_PEI_HAND_OFF*)(UINTN) TopOfStack; SecCoreData = (EFI_SEC_PEI_HAND_OFF*)(UINTN) TopOfStack;
SecCoreData->DataSize = sizeof(EFI_SEC_PEI_HAND_OFF); SecCoreData->DataSize = sizeof(EFI_SEC_PEI_HAND_OFF);
SecCoreData->BootFirmwareVolumeBase = (VOID*)BootFirmwareVolumeBase; SecCoreData->BootFirmwareVolumeBase = (VOID*)BootFirmwareVolumeBase;
SecCoreData->BootFirmwareVolumeSize = FixedPcdGet32(PcdWinNtFirmwareFdSize); SecCoreData->BootFirmwareVolumeSize = PcdGet32(PcdWinNtFirmwareFdSize);
SecCoreData->TemporaryRamBase = (VOID*)(UINTN)LargestRegion; SecCoreData->TemporaryRamBase = (VOID*)(UINTN)LargestRegion;
SecCoreData->TemporaryRamSize = STACK_SIZE; SecCoreData->TemporaryRamSize = STACK_SIZE;
SecCoreData->StackBase = SecCoreData->TemporaryRamBase; SecCoreData->StackBase = SecCoreData->TemporaryRamBase;

View File

@ -3,7 +3,7 @@
# #
# Main executable file of NT32 Emulator that loads PEI core after initialization finished. # 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 # All rights reserved. This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # 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 # 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 FILE_GUID = 4b837b03-6587-4d19-b82b-edfad836c0a0
MODULE_TYPE = USER_DEFINED MODULE_TYPE = USER_DEFINED
VERSION_STRING = 1.0 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. # The following information is for reference only and not required by the build tools.
@ -28,7 +26,7 @@
# VALID_ARCHITECTURES = IA32 # VALID_ARCHITECTURES = IA32
# #
[Sources.common] [Sources]
SecMain.h SecMain.h
WinNtThunk.c WinNtThunk.c
FwVol.c FwVol.c
@ -50,7 +48,6 @@
PeCoffLib PeCoffLib
ReportStatusCodeLib ReportStatusCodeLib
[Ppis] [Ppis]
gNtPeiLoadFilePpiGuid # PPI ALWAYS_PRODUCED gNtPeiLoadFilePpiGuid # PPI ALWAYS_PRODUCED
gEfiPeiStatusCodePpiGuid # PPI ALWAYS_PRODUCED gEfiPeiStatusCodePpiGuid # PPI ALWAYS_PRODUCED
@ -59,8 +56,7 @@
gPeiNtThunkPpiGuid # PPI ALWAYS_PRODUCED gPeiNtThunkPpiGuid # PPI ALWAYS_PRODUCED
gEfiTemporaryRamSupportPpiGuid gEfiTemporaryRamSupportPpiGuid
[Pcd]
[FixedPcd.common]
gEfiNt32PkgTokenSpaceGuid.PcdWinNtBootMode gEfiNt32PkgTokenSpaceGuid.PcdWinNtBootMode
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize
gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySizeForSecMain gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySizeForSecMain

View File

@ -3,7 +3,7 @@
# #
# This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices # This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices
# on the NT32 emulator. # on the NT32 emulator.
# Copyright (c) 2006 - 2007, Intel Corporation # Copyright (c) 2006 - 2010, Intel Corporation
# #
# All rights reserved. This program and the accompanying materials # All rights reserved. This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -21,9 +21,6 @@
FILE_GUID = F0384FFD-8633-452f-9010-F6B7D2EAE2F1 FILE_GUID = F0384FFD-8633-452f-9010-F6B7D2EAE2F1
MODULE_TYPE = PEIM MODULE_TYPE = PEIM
VERSION_STRING = 1.0 VERSION_STRING = 1.0
EDK_RELEASE_VERSION = 0x00020000
EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = PeimInitializeWinNtFwh ENTRY_POINT = PeimInitializeWinNtFwh
# #
@ -32,10 +29,9 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC # VALID_ARCHITECTURES = IA32 X64 IPF EBC
# #
[Sources.common] [Sources]
WinntFwh.c WinntFwh.c
[Packages] [Packages]
Nt32Pkg/Nt32Pkg.dec Nt32Pkg/Nt32Pkg.dec
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
@ -50,18 +46,16 @@
[Ppis] [Ppis]
gNtFwhPpiGuid # PPI ALWAYS_CONSUMED gNtFwhPpiGuid # PPI ALWAYS_CONSUMED
[Pcd]
[FixedPcd.common]
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
[depex] [Depex]
gNtFwhPpiGuid AND gEfiPeiMemoryDiscoveredPpiGuid gNtFwhPpiGuid AND gEfiPeiMemoryDiscoveredPpiGuid

View File

@ -1,6 +1,6 @@
/**@file /**@file
Copyright (c) 2006 - 2009, Intel Corporation Copyright (c) 2006 - 2010, Intel Corporation
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -801,7 +801,7 @@ Returns:
// we must set the default values if a null argument is passed in. // we must set the default values if a null argument is passed in.
// //
if (BaudRate == 0) { if (BaudRate == 0) {
BaudRate = FixedPcdGet64 (PcdUartDefaultBaudRate); BaudRate = PcdGet64 (PcdUartDefaultBaudRate);
} }
if (ReceiveFifoDepth == 0) { if (ReceiveFifoDepth == 0) {
@ -813,15 +813,15 @@ Returns:
} }
if (Parity == DefaultParity) { if (Parity == DefaultParity) {
Parity = (EFI_PARITY_TYPE) (FixedPcdGet8 (PcdUartDefaultParity)); Parity = (EFI_PARITY_TYPE) (PcdGet8 (PcdUartDefaultParity));
} }
if (DataBits == 0) { if (DataBits == 0) {
DataBits = FixedPcdGet8 (PcdUartDefaultDataBits); DataBits = PcdGet8 (PcdUartDefaultDataBits);
} }
if (StopBits == DefaultStopBits) { if (StopBits == DefaultStopBits) {
StopBits = (EFI_STOP_BITS_TYPE) FixedPcdGet8 (PcdUartDefaultStopBits); StopBits = (EFI_STOP_BITS_TYPE) PcdGet8 (PcdUartDefaultStopBits);
} }
// //

View File

@ -3,7 +3,7 @@
# #
# Our DriverBinding member functions operate on the handles # Our DriverBinding member functions operate on the handles
# created by the NT Bus drive # created by the NT Bus drive
# Copyright (c) 2006 - 2007, Intel Corporation # Copyright (c) 2006 - 2010, Intel Corporation
# #
# All rights reserved. This program and the accompanying materials # All rights reserved. This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -21,9 +21,6 @@
FILE_GUID = 6B41B553-A649-11d4-BD02-0080C73C8881 FILE_GUID = 6B41B553-A649-11d4-BD02-0080C73C8881
MODULE_TYPE = UEFI_DRIVER MODULE_TYPE = UEFI_DRIVER
VERSION_STRING = 1.0 VERSION_STRING = 1.0
EDK_RELEASE_VERSION = 0x00020000
EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = InitializeWinNtSerialIo ENTRY_POINT = InitializeWinNtSerialIo
# #
@ -35,17 +32,15 @@
# COMPONENT_NAME = gWinNtSerialIoComponentName # COMPONENT_NAME = gWinNtSerialIoComponentName
# #
[Sources.common] [Sources]
ComponentName.c ComponentName.c
WinNtSerialIo.c WinNtSerialIo.c
WinNtSerialIo.h WinNtSerialIo.h
[Packages] [Packages]
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
Nt32Pkg/Nt32Pkg.dec Nt32Pkg/Nt32Pkg.dec
[LibraryClasses] [LibraryClasses]
MemoryAllocationLib MemoryAllocationLib
DevicePathLib DevicePathLib
@ -56,17 +51,15 @@
BaseLib BaseLib
DebugLib DebugLib
[Guids] [Guids]
gEfiWinNtSerialPortGuid # ALWAYS_CONSUMED gEfiWinNtSerialPortGuid # ALWAYS_CONSUMED
[Protocols] [Protocols]
gEfiSerialIoProtocolGuid # PROTOCOL BY_START gEfiSerialIoProtocolGuid # PROTOCOL BY_START
gEfiDevicePathProtocolGuid # PROTOCOL TO_START gEfiDevicePathProtocolGuid # PROTOCOL TO_START
gEfiWinNtIoProtocolGuid # PROTOCOL TO_START gEfiWinNtIoProtocolGuid # PROTOCOL TO_START
[FixedPcd.common] [Pcd]
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1