From c37f052fe912998d88abd58c5446a03b546f4831 Mon Sep 17 00:00:00 2001
From: mdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 29 Jan 2010 23:34:42 +0000
Subject: [PATCH] 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. Do
 some minor clean ups to INF files

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9867 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf            | 12 ++++++------
 .../Bus/Isa/IsaSerialDxe/Serial.c                    |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
index 81f02ecd10..b2f628c2b7 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
@@ -1,7 +1,7 @@
 #/** @file
 # Serial driver for standard UARTS on an ISA bus.
 #
-# Copyright (c) 2007 - 2009, 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
@@ -19,7 +19,6 @@
   FILE_GUID                      = 93B80003-9FB3-11d4-9A3A-0090273FC14D
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
-  EFI_SPECIFICATION_VERSION      = 0x00020000
   ENTRY_POINT                    = InitializeIsaSerial
 
 #
@@ -32,7 +31,7 @@
 #  COMPONENT_NAME2               =  gIsaSerialComponentName2
 #
 
-[Sources.common]
+[Sources]
   ComponentName.c
   Serial.h
   Serial.c
@@ -58,11 +57,12 @@
   gEfiDevicePathProtocolGuid                    ## TO_START
   gEfiSerialIoProtocolGuid                      ## BY_START
 
-[FixedPcd.common]
+[FeaturePcd]
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSerialUseHalfHandshake|FALSE
+  
+[FixedPcd]
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1
 
-[FeaturePcd.common]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSerialUseHalfHandshake|FALSE
diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c
index 03049180e7..03dae25b2d 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/Serial.c
@@ -1117,7 +1117,7 @@ IsaSerialSetAttributes (
   // Check for default settings and fill in actual values.
   //
   if (BaudRate == 0) {
-    BaudRate = FixedPcdGet64 (PcdUartDefaultBaudRate);
+    BaudRate = PcdGet64 (PcdUartDefaultBaudRate);
   }
 
   if (ReceiveFifoDepth == 0) {
@@ -1129,15 +1129,15 @@ IsaSerialSetAttributes (
   }
 
   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);
   }
   //
   // 5 and 6 data bits can not be verified on a 16550A UART
-- 
2.39.2