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, 15 deletions

diff --git a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c
index 17e4fdacf..b2c908957 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 7bc260c42..a640ef5d9 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