summaryrefslogtreecommitdiff
path: root/Nt32Pkg
diff options
context:
space:
mode:
authormdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524>2010-01-29 23:30:55 +0000
committermdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524>2010-01-29 23:30:55 +0000
commitf7c58a94cf72eb00f0931c89d935a164abaadf50 (patch)
tree9b4af6a5a4bf9f436917d7a19a9106eb78137a7b /Nt32Pkg
parentd5b0f232f77a0e1e86dc9d63c879eb486f15b1c4 (diff)
downloadedk2-platforms-f7c58a94cf72eb00f0931c89d935a164abaadf50.tar.xz
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
Diffstat (limited to 'Nt32Pkg')
-rw-r--r--Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf31
-rw-r--r--Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf12
-rw-r--r--Nt32Pkg/Sec/SecMain.c10
-rw-r--r--Nt32Pkg/Sec/SecMain.inf10
-rw-r--r--Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf14
-rw-r--r--Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c10
-rw-r--r--Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf13
7 files changed, 35 insertions, 65 deletions
diff --git a/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf b/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
index 2982500841..5533434a9a 100644
--- a/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
+++ b/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
@@ -3,7 +3,7 @@
#
# This DXE runtime driver implements and produces the Fimware Volue Block Protocol on
# NT32 emulator.
-# Copyright (c) 2006 - 2007, 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
@@ -21,9 +21,6 @@
FILE_GUID = BDFE5FAA-2A35-44bb-B17A-8084D4E2B9E9
MODULE_TYPE = DXE_RUNTIME_DRIVER
VERSION_STRING = 1.0
- EDK_RELEASE_VERSION = 0x00020000
- EFI_SPECIFICATION_VERSION = 0x00020000
-
ENTRY_POINT = FvbInitialize
#
@@ -32,18 +29,16 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
FvbInfo.c
FwBlockService.h
FWBlockService.c
-
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
Nt32Pkg/Nt32Pkg.dec
-
[LibraryClasses]
UefiBootServicesTableLib
MemoryAllocationLib
@@ -57,7 +52,6 @@
UefiLib
PcdLib
-
[Guids]
gEfiEventVirtualAddressChangeGuid # ALWAYS_CONSUMED Create Event: EVENT_GROUP_GUID
@@ -65,23 +59,22 @@
gEfiFirmwareVolumeBlockProtocolGuid # PROTOCOL ALWAYS_PRODUCED
gEfiDevicePathProtocolGuid # PROTOCOL SOMETIMES_PRODUCED
-[FixedPcd.common]
- gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize
- gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareBlockSize
-
- gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase
+[FixedPcd]
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize
- gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase
+ gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareBlockSize
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize
-[Pcd.common]
- gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
+[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
- gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase
- gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
+ gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize
+ gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase
+ gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase
-[depex]
+[Depex]
TRUE
diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
index a8e6472018..f5772724e6 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
@@ -5,7 +5,7 @@
# 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
# 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
# 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
MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0
- EDK_RELEASE_VERSION = 0x00020000
- EFI_SPECIFICATION_VERSION = 0x00020000
-
ENTRY_POINT = MiscSubclassDriverEntryPoint
#
@@ -34,7 +31,7 @@
# VALID_ARCHITECTURES = IA32
#
-[Sources.common]
+[Sources]
MiscBaseBoardManufacturerData.c
MiscBaseBoardManufacturerFunction.c
MiscBiosVendorData.c
@@ -72,7 +69,6 @@
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
Nt32Pkg/Nt32Pkg.dec
-
[LibraryClasses]
DevicePathLib
UefiBootServicesTableLib
@@ -89,11 +85,9 @@
gEfiWinNtIoProtocolGuid # PROTOCOL_NOTIFY SOMETIMES_CONSUMED
gEfiSmbiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED
-[FixedPcd.common]
+[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareReleaseDateString
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString
-
-[Pcd.common]
gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize
gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang
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
diff --git a/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf b/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf
index 444ffbd79a..a14959fcff 100644
--- a/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf
+++ b/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf
@@ -3,7 +3,7 @@
#
# This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices
# 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
# 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
MODULE_TYPE = PEIM
VERSION_STRING = 1.0
- EDK_RELEASE_VERSION = 0x00020000
- EFI_SPECIFICATION_VERSION = 0x00020000
-
ENTRY_POINT = PeimInitializeWinNtFwh
#
@@ -32,10 +29,9 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
-[Sources.common]
+[Sources]
WinntFwh.c
-
[Packages]
Nt32Pkg/Nt32Pkg.dec
MdePkg/MdePkg.dec
@@ -50,18 +46,16 @@
[Ppis]
gNtFwhPpiGuid # PPI ALWAYS_CONSUMED
-
-[FixedPcd.common]
+[Pcd]
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase
-
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
-[depex]
+[Depex]
gNtFwhPpiGuid AND gEfiPeiMemoryDiscoveredPpiGuid \ No newline at end of file
diff --git a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c
index 17e4fdacf6..b2c9089572 100644
--- a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c
+++ b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c
@@ -1,6 +1,6 @@
/**@file
-Copyright (c) 2006 - 2009, 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
@@ -801,7 +801,7 @@ Returns:
// we must set the default values if a null argument is passed in.
//
if (BaudRate == 0) {
- BaudRate = FixedPcdGet64 (PcdUartDefaultBaudRate);
+ BaudRate = PcdGet64 (PcdUartDefaultBaudRate);
}
if (ReceiveFifoDepth == 0) {
@@ -813,15 +813,15 @@ Returns:
}
if (Parity == DefaultParity) {
- Parity = (EFI_PARITY_TYPE) (FixedPcdGet8 (PcdUartDefaultParity));
+ Parity = (EFI_PARITY_TYPE) (PcdGet8 (PcdUartDefaultParity));
}
if (DataBits == 0) {
- DataBits = FixedPcdGet8 (PcdUartDefaultDataBits);
+ DataBits = PcdGet8 (PcdUartDefaultDataBits);
}
if (StopBits == DefaultStopBits) {
- StopBits = (EFI_STOP_BITS_TYPE) FixedPcdGet8 (PcdUartDefaultStopBits);
+ StopBits = (EFI_STOP_BITS_TYPE) PcdGet8 (PcdUartDefaultStopBits);
}
//
diff --git a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf
index 7bc260c429..a640ef5d91 100644
--- a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf
+++ b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf
@@ -3,7 +3,7 @@
#
# Our DriverBinding member functions operate on the handles
# 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
# 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
MODULE_TYPE = UEFI_DRIVER
VERSION_STRING = 1.0
- EDK_RELEASE_VERSION = 0x00020000
- EFI_SPECIFICATION_VERSION = 0x00020000
-
ENTRY_POINT = InitializeWinNtSerialIo
#
@@ -35,17 +32,15 @@
# COMPONENT_NAME = gWinNtSerialIoComponentName
#
-[Sources.common]
+[Sources]
ComponentName.c
WinNtSerialIo.c
WinNtSerialIo.h
-
[Packages]
MdePkg/MdePkg.dec
Nt32Pkg/Nt32Pkg.dec
-
[LibraryClasses]
MemoryAllocationLib
DevicePathLib
@@ -56,17 +51,15 @@
BaseLib
DebugLib
-
[Guids]
gEfiWinNtSerialPortGuid # ALWAYS_CONSUMED
-
[Protocols]
gEfiSerialIoProtocolGuid # PROTOCOL BY_START
gEfiDevicePathProtocolGuid # PROTOCOL TO_START
gEfiWinNtIoProtocolGuid # PROTOCOL TO_START
-[FixedPcd.common]
+[Pcd]
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8
gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1