X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FBus%2FPci%2FPciBusDxe%2FPciBus.h;h=55eb3a5a80700e3956c6974df6503ee78e9e7243;hb=dc080d3b61e570e7a3163fc24afa6f8388d0c0bf;hp=239835eab75fc3a7cd67a5d32e9b2b930fa1d5e4;hpb=8db6a82c50fe16bd16a8dc53e890f13a8a91896c;p=mirror_edk2.git

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
index 239835eab7..55eb3a5a80 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h
@@ -1,7 +1,7 @@
 /** @file
   Header files and data structures needed by PCI Bus module.
 
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 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
@@ -32,7 +32,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/IncompatiblePciDeviceSupport.h>
 #include <Protocol/PciOverride.h>
 #include <Protocol/PciEnumerationComplete.h>
-#include <Protocol/DevicePathToText.h>
+#include <Protocol/IoMmu.h>
 
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>
@@ -103,8 +103,7 @@ struct _PCI_BAR {
   UINT64        Length;
   UINT64        Alignment;
   PCI_BAR_TYPE  BarType;
-  BOOLEAN       Prefetchable;
-  UINT8         MemType;
+  BOOLEAN       BarTypeFixed;
   UINT16        Offset;
 };
 
@@ -205,7 +204,7 @@ struct _PCI_IO_DEVICE {
   LIST_ENTRY                                ChildList;
 
   //
-  // TURE if the PCI bus driver creates the handle for this PCI device
+  // TRUE if the PCI bus driver creates the handle for this PCI device
   //
   BOOLEAN                                   Registered;
 
@@ -240,11 +239,6 @@ struct _PCI_IO_DEVICE {
   //
   UINT64                                    RomSize;
 
-  //
-  // The OptionRom Size
-  //
-  UINT64                                    RomBase;
-
   //
   // TRUE if all OpROM (in device or in platform specific position) have been processed
   //
@@ -268,6 +262,11 @@ struct _PCI_IO_DEVICE {
   EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR         *ResourcePaddingDescriptors;
   EFI_HPC_PADDING_ATTRIBUTES                PaddingAttributes;
 
+  //
+  // Bus number ranges for a PCI Root Bridge device
+  //
+  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR         *BusNumberRanges;
+
   BOOLEAN                                   IsPciExp;
   //
   // For SR-IOV
@@ -282,7 +281,7 @@ struct _PCI_IO_DEVICE {
   UINT16                                    ReservedBusNum;
   //
   // Per PCI to PCI Bridge spec, I/O window is 4K aligned,
-  // but some chipsets support non-stardard I/O window aligments less than 4K.
+  // but some chipsets support non-standard I/O window alignments less than 4K.
   // This field is used to support this case.
   //
   UINT16                                    BridgeIoAlignment;
@@ -305,7 +304,7 @@ struct _PCI_IO_DEVICE {
 //
 // Global Variables
 //
-extern EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL *gEfiIncompatiblePciDeviceSupport;
+extern EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL *gIncompatiblePciDeviceSupport;
 extern EFI_DRIVER_BINDING_PROTOCOL                  gPciBusDriverBinding;
 extern EFI_COMPONENT_NAME_PROTOCOL                  gPciBusComponentName;
 extern EFI_COMPONENT_NAME2_PROTOCOL                 gPciBusComponentName2;
@@ -324,8 +323,8 @@ extern BOOLEAN                                      mReserveVgaAliases;
 
   @param  _p      Specified device.
 
-  @retval TRUE    Device is a a GFX device.
-  @retval FALSE   Device is not a a GFX device.
+  @retval TRUE    Device is a GFX device.
+  @retval FALSE   Device is not a GFX device.
 
 **/
 #define IS_PCI_GFX(_p)     IS_CLASS2 (_p, PCI_CLASS_DISPLAY, PCI_CLASS_DISPLAY_OTHER)
@@ -336,7 +335,7 @@ extern BOOLEAN                                      mReserveVgaAliases;
 
   @param  This                Protocol instance pointer.
   @param  Controller          Handle of device to test.
-  @param  RemainingDevicePath Optional parameter use to pick a specific child.
+  @param  RemainingDevicePath Optional parameter use to pick a specific child
                               device to start.
 
   @retval EFI_SUCCESS         This driver supports this device.
@@ -358,7 +357,7 @@ PciBusDriverBindingSupported (
 
   @param  This                 Protocol instance pointer.
   @param  Controller           Handle of device to bind driver to.
-  @param  RemainingDevicePath  Optional parameter use to pick a specific child.
+  @param  RemainingDevicePath  Optional parameter use to pick a specific child
                                device to start.
 
   @retval EFI_SUCCESS          This driver is added to ControllerHandle.
@@ -375,7 +374,7 @@ PciBusDriverBindingStart (
   );
 
 /**
-  Stop this driver on ControllerHandle. Support stoping any child handles
+  Stop this driver on ControllerHandle. Support stopping any child handles
   created by this driver.
 
   @param  This              Protocol instance pointer.