MdeModulePkg/PciBus: Add IOMMU support.

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / PciBusDxe / PciBus.h

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
index fc62a251c231d28f9df0a93a2d2a80ea7a676b73..3bcc134d0b3b83103979158a06135edede00fbc6 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
@@ -1,7 +1,7 @@
 /** @file\r
   Header files and data structures needed by PCI Bus module.\r
 \r
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
 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
@@ -32,6 +32,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/IncompatiblePciDeviceSupport.h>\r
 #include <Protocol/PciOverride.h>\r
 #include <Protocol/PciEnumerationComplete.h>\r
+#include <Protocol/IoMmu.h>\r
 \r
 #include <Library/DebugLib.h>\r
 #include <Library/UefiDriverEntryPoint.h>\r
@@ -102,8 +103,7 @@ struct _PCI_BAR {
   UINT64        Length;\r
   UINT64        Alignment;\r
   PCI_BAR_TYPE  BarType;\r
-  BOOLEAN       Prefetchable;\r
-  UINT8         MemType;\r
+  BOOLEAN       BarTypeFixed;\r
   UINT16        Offset;\r
 };\r
 \r
@@ -204,7 +204,7 @@ struct _PCI_IO_DEVICE {
   LIST_ENTRY                                ChildList;\r
 \r
   //\r
-  // TURE if the PCI bus driver creates the handle for this PCI device\r
+  // TRUE if the PCI bus driver creates the handle for this PCI device\r
   //\r
   BOOLEAN                                   Registered;\r
 \r
@@ -249,11 +249,6 @@ struct _PCI_IO_DEVICE {
   //\r
   BOOLEAN                                   AllOpRomProcessed;\r
 \r
-  //\r
-  // TRUE if the ROM image contains EFI OpROM\r
-  //\r
-  BOOLEAN                                   HasEfiOpRom;\r
-\r
   //\r
   // TRUE if there is any EFI driver in the OptionRom\r
   //\r
@@ -291,7 +286,7 @@ struct _PCI_IO_DEVICE {
   UINT16                                    ReservedBusNum;\r
   //\r
   // Per PCI to PCI Bridge spec, I/O window is 4K aligned,\r
-  // but some chipsets support non-stardard I/O window aligments less than 4K.\r
+  // but some chipsets support non-standard I/O window alignments less than 4K.\r
   // This field is used to support this case.\r
   //\r
   UINT16                                    BridgeIoAlignment;\r
@@ -314,7 +309,7 @@ struct _PCI_IO_DEVICE {
 //\r
 // Global Variables\r
 //\r
-extern EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL *gEfiIncompatiblePciDeviceSupport;\r
+extern EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL *gIncompatiblePciDeviceSupport;\r
 extern EFI_DRIVER_BINDING_PROTOCOL                  gPciBusDriverBinding;\r
 extern EFI_COMPONENT_NAME_PROTOCOL                  gPciBusComponentName;\r
 extern EFI_COMPONENT_NAME2_PROTOCOL                 gPciBusComponentName2;\r
@@ -333,8 +328,8 @@ extern BOOLEAN                                      mReserveVgaAliases;
 \r
   @param  _p      Specified device.\r
 \r
-  @retval TRUE    Device is a a GFX device.\r
-  @retval FALSE   Device is not a a GFX device.\r
+  @retval TRUE    Device is a GFX device.\r
+  @retval FALSE   Device is not a GFX device.\r
 \r
 **/\r
 #define IS_PCI_GFX(_p)     IS_CLASS2 (_p, PCI_CLASS_DISPLAY, PCI_CLASS_DISPLAY_OTHER)\r
@@ -345,7 +340,7 @@ extern BOOLEAN                                      mReserveVgaAliases;
 \r
   @param  This                Protocol instance pointer.\r
   @param  Controller          Handle of device to test.\r
-  @param  RemainingDevicePath Optional parameter use to pick a specific child.\r
+  @param  RemainingDevicePath Optional parameter use to pick a specific child\r
                               device to start.\r
 \r
   @retval EFI_SUCCESS         This driver supports this device.\r
@@ -367,7 +362,7 @@ PciBusDriverBindingSupported (
 \r
   @param  This                 Protocol instance pointer.\r
   @param  Controller           Handle of device to bind driver to.\r
-  @param  RemainingDevicePath  Optional parameter use to pick a specific child.\r
+  @param  RemainingDevicePath  Optional parameter use to pick a specific child\r
                                device to start.\r
 \r
   @retval EFI_SUCCESS          This driver is added to ControllerHandle.\r
@@ -384,7 +379,7 @@ PciBusDriverBindingStart (
   );\r
 \r
 /**\r
-  Stop this driver on ControllerHandle. Support stoping any child handles\r
+  Stop this driver on ControllerHandle. Support stopping any child handles\r
   created by this driver.\r
 \r
   @param  This              Protocol instance pointer.\r