Merge 3 PCDs for the ISA Bus Driver to a single PCD that is a bitmask of features.

[mirror_edk2.git] / IntelFrameworkModulePkg / Bus / Isa / IsaBusDxe / IsaBusDxe.inf

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
index 4ef431430e3e65ef07132105d9cd1b3a7d535942..1405c41a9c6a9e9d292e98ca2f022cdc1d40e583 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
@@ -1,12 +1,10 @@
 #/** @file\r
 # Component description file for IsaBus module.\r
 #\r
-# Discovers all the ISA Controllers and their resources by using the ISA PnP\r
-# Protocol, produces an instance of the ISA I/O Protocol for every ISA\r
-# Controller found, loads and initializes all ISA Device Drivers, matches ISA\r
-# Device Drivers with their respective ISA Controllers in a deterministic\r
-# manner, and informs a ISA Device Driver when it is to start managing an ISA\r
-# Controller.\r
+# Discovers all the ISA Controllers and their resources by using the ISA ACPI \r
+# Protocol, produces an instance of the ISA I/O Protocol for every ISA \r
+# Controller found. This driver is designed to manage a PCI-to-ISA bridge Device\r
+# such as LPC bridge.\r
 #\r
 # Copyright (c) 2007 - 2009, Intel Corporation\r
 #\r
@@ -28,7 +26,12 @@
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
   ENTRY_POINT                    = InitializeIsaBus\r
 \r
+#\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  DRIVER_BINDING                = gIsaBusControllerDriver\r
+#  COMPONENT_NAME                = gIsaBusComponentName;\r
+#  COMPONENT_NAME2               = gIsaBusComponentName2;\r
+#\r
 \r
 [Sources.common]\r
   ComponentName.c\r
@@ -55,9 +58,6 @@
   UefiDriverEntryPoint\r
   DebugLib\r
 \r
-[Guids]\r
-  gEfiStatusCodeSpecificDataGuid                # ALWAYS_CONSUMED\r
-\r
 [Protocols]\r
   gEfiIsaIoProtocolGuid                         # PROTOCOL BY_START\r
   gEfiIsaAcpiProtocolGuid                       # PROTOCOL TO_START\r
@@ -65,9 +65,7 @@
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
   gEfiGenericMemTestProtocolGuid                # PROTOCOL TO_START\r
 \r
-[FeaturePcd.common]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusOnlySupportSlaveDma\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportDma\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportIsaMemory\r
+[Pcd.common]\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportedFeatures\r
 \r
 \r