Remove unnecessary use of FixedPcdxxx() functions and [FixedPcd] INF sections. These...

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

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

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
index a8e64720181451955bc7f46d0bdc5a3ca104a49f..f5772724e600c067e6b8b951fd7644fa80616f16 100644 (file)
--- 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\r
 #  MiscSubclassDriver.uni file, the StrGather tool will expand MiscSubclassDriver.uni file\r
 #  and parse all .uni file.\r
-# Copyright (c) 2006 - 2009, Intel Corporation\r
+# Copyright (c) 2006 - 2010, Intel Corporation\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -23,9 +23,6 @@
   FILE_GUID                      = 4A9B9DB8-EC62-4A92-818F-8AA0246D246E\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r
   ENTRY_POINT                    = MiscSubclassDriverEntryPoint\r
 \r
 #\r
@@ -34,7 +31,7 @@
 #  VALID_ARCHITECTURES           = IA32\r
 #\r
 \r
-[Sources.common]\r
+[Sources]\r
   MiscBaseBoardManufacturerData.c\r
   MiscBaseBoardManufacturerFunction.c\r
   MiscBiosVendorData.c\r
@@ -72,7 +69,6 @@
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
   Nt32Pkg/Nt32Pkg.dec\r
 \r
-\r
 [LibraryClasses]\r
   DevicePathLib\r
   UefiBootServicesTableLib\r
@@ -89,11 +85,9 @@
   gEfiWinNtIoProtocolGuid                       # PROTOCOL_NOTIFY SOMETIMES_CONSUMED\r
   gEfiSmbiosProtocolGuid                        # PROTOCOL ALWAYS_CONSUMED\r
 \r
-[FixedPcd.common]\r
+[Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareReleaseDateString\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString\r
-\r
-[Pcd.common]\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang\r
 \r

diff --git a/Nt32Pkg/Sec/SecMain.c b/Nt32Pkg/Sec/SecMain.c
index 21cca57d5dfdb344229709608a7c28e190b77300..2c6715d84aa52270de91a2c18e2ededc342d9796 100644 (file)
--- a/Nt32Pkg/Sec/SecMain.c
+++ b/Nt32Pkg/Sec/SecMain.c
@@ -1,6 +1,6 @@
 /**@file\r
 \r
-Copyright (c) 2006, Intel Corporation\r
+Copyright (c) 2006 - 2010, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -168,8 +168,8 @@ Returns:
   CHAR16                *FirmwareVolumesStr;\r
   UINTN                 *StackPointer;\r
 \r
-  MemorySizeStr      = (CHAR16 *) FixedPcdGetPtr (PcdWinNtMemorySizeForSecMain);\r
-  FirmwareVolumesStr = (CHAR16 *) FixedPcdGetPtr (PcdWinNtFirmwareVolume);\r
+  MemorySizeStr      = (CHAR16 *) PcdGetPtr (PcdWinNtMemorySizeForSecMain);\r
+  FirmwareVolumesStr = (CHAR16 *) PcdGetPtr (PcdWinNtFirmwareVolume);\r
 \r
   SecPrint ("\nEDK II SEC Main NT Emulation Environment from www.TianoCore.org\n");\r
 \r
@@ -201,7 +201,7 @@ Returns:
   //\r
   // Setup Boot Mode. If BootModeStr == "" then BootMode = 0 (BOOT_WITH_FULL_CONFIGURATION)\r
   //\r
-  SecPrint ("  BootMode 0x%02x\n", FixedPcdGet32 (PcdWinNtBootMode));\r
+  SecPrint ("  BootMode 0x%02x\n", PcdGet32 (PcdWinNtBootMode));\r
 \r
   //\r
   //  Allocate 128K memory to emulate temp memory for PEI.\r
@@ -606,7 +606,7 @@ Returns:
   SecCoreData                        = (EFI_SEC_PEI_HAND_OFF*)(UINTN) TopOfStack;\r
   SecCoreData->DataSize               = sizeof(EFI_SEC_PEI_HAND_OFF);\r
   SecCoreData->BootFirmwareVolumeBase = (VOID*)BootFirmwareVolumeBase;\r
-  SecCoreData->BootFirmwareVolumeSize = FixedPcdGet32(PcdWinNtFirmwareFdSize);\r
+  SecCoreData->BootFirmwareVolumeSize = PcdGet32(PcdWinNtFirmwareFdSize);\r
   SecCoreData->TemporaryRamBase       = (VOID*)(UINTN)LargestRegion; \r
   SecCoreData->TemporaryRamSize       = STACK_SIZE;\r
   SecCoreData->StackBase              = SecCoreData->TemporaryRamBase;\r

diff --git a/Nt32Pkg/Sec/SecMain.inf b/Nt32Pkg/Sec/SecMain.inf
index cafa08b41fdbcbd9c6e76b5adc4290ee59d521ee..1b10a62d75d51ef0a2c72dfb957a44e760712f0b 100644 (file)
--- a/Nt32Pkg/Sec/SecMain.inf
+++ b/Nt32Pkg/Sec/SecMain.inf
@@ -3,7 +3,7 @@
 #\r
 # Main executable file of NT32 Emulator that loads PEI core after initialization finished.\r
 #\r
-#  Copyright (c) 2007, Intel Corporation\r
+#  Copyright (c) 2007 - 2010, Intel Corporation\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
@@ -19,8 +19,6 @@
   FILE_GUID                      = 4b837b03-6587-4d19-b82b-edfad836c0a0\r
   MODULE_TYPE                    = USER_DEFINED\r
   VERSION_STRING                 = 1.0\r
-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
@@ -28,7 +26,7 @@
 #  VALID_ARCHITECTURES           = IA32\r
 #\r
 \r
-[Sources.common]\r
+[Sources]\r
   SecMain.h\r
   WinNtThunk.c\r
   FwVol.c\r
@@ -50,7 +48,6 @@
   PeCoffLib\r
   ReportStatusCodeLib\r
 \r
-\r
 [Ppis]\r
   gNtPeiLoadFilePpiGuid                         # PPI ALWAYS_PRODUCED\r
   gEfiPeiStatusCodePpiGuid                      # PPI ALWAYS_PRODUCED\r
@@ -59,8 +56,7 @@
   gPeiNtThunkPpiGuid                            # PPI ALWAYS_PRODUCED\r
   gEfiTemporaryRamSupportPpiGuid\r
 \r
-\r
-[FixedPcd.common]\r
+[Pcd]\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtBootMode\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize\r
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySizeForSecMain\r

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

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

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