Move gEfiPciOptionRomTableGuid from IntelFrameworkModulePkg to the DuetPkg

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

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h
index 9dfdbe62d77ea664f03062c6ce11add937e80391..8f2e29c16e1020db597294ab9ebb88a2c2784806 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h
@@ -22,14 +22,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/LoadedImage.h>\r
 #include <Protocol/PciHostBridgeResourceAllocation.h>\r
 #include <Protocol/PciIo.h>\r
-#include <Guid/PciHotplugDevice.h>\r
+#include <Protocol/LoadFile2.h>\r
 #include <Protocol/PciRootBridgeIo.h>\r
 #include <Protocol/PciHotPlugRequest.h>\r
 #include <Protocol/DevicePath.h>\r
 #include <Protocol/PciPlatform.h>\r
 #include <Protocol/PciHotPlugInit.h>\r
 #include <Protocol/Decompress.h>\r
-#include <Guid/PciOptionRomTable.h>\r
 #include <Protocol/BusSpecificDriverOverride.h>\r
 #include <Protocol/UgaIo.h>\r
 #include <Protocol/IncompatiblePciDeviceSupport.h>\r
@@ -52,6 +51,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <IndustryStandard/Acpi.h>\r
 #include "ComponentName.h"\r
 \r
+\r
+//\r
+// Global Variables\r
+//\r
+extern EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL *gEfiIncompatiblePciDeviceSupport;\r
+extern EFI_DRIVER_BINDING_PROTOCOL                  gPciBusDriverBinding;\r
+extern EFI_COMPONENT_NAME_PROTOCOL                  gPciBusComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL                 gPciBusComponentName2;\r
+\r
 //\r
 // Driver Produced Protocol Prototypes\r
 //\r
@@ -129,6 +137,7 @@ typedef struct _PCI_IO_DEVICE {
   EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL PciDriverOverride;\r
   EFI_DEVICE_PATH_PROTOCOL                  *DevicePath;\r
   EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL           *PciRootBridgeIo;\r
+  EFI_LOAD_FILE2_PROTOCOL                   LoadFile2;\r
 \r
   //\r
   // PCI configuration space header type\r
@@ -230,13 +239,12 @@ typedef struct _PCI_IO_DEVICE {
 #define PCI_IO_DEVICE_FROM_LINK(a) \\r
   CR (a, PCI_IO_DEVICE, Link, PCI_IO_DEVICE_SIGNATURE)\r
 \r
+#define PCI_IO_DEVICE_FROM_LOAD_FILE2_THIS(a) \\r
+  CR (a, PCI_IO_DEVICE, LoadFile2, PCI_IO_DEVICE_SIGNATURE)\r
+\r
 //\r
 // Global Variables\r
 //\r
-extern EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL *gEfiIncompatiblePciDeviceSupport;\r
-extern EFI_DRIVER_BINDING_PROTOCOL                  gPciBusDriverBinding;\r
-extern EFI_COMPONENT_NAME_PROTOCOL                  gPciBusComponentName;\r
-extern EFI_COMPONENT_NAME2_PROTOCOL                 gPciBusComponentName2;\r
 extern LIST_ENTRY                                   gPciDevicePool;\r
 extern BOOLEAN                                      gFullEnumeration;\r
 extern UINTN                                        gPciHostBridgeNumber;\r