Remove the unnecessary top level header files in protocol header file.

[mirror_edk2.git] / DuetPkg / PciBusNoEnumerationDxe / PciBus.h

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
index db5215ca1b8490b6a99923a0216e0f28e543dc23..168108928f4521b7a256c401221c3c6d4babca7d 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
@@ -24,7 +24,7 @@ Revision History
 #ifndef _EFI_PCI_BUS_H\r
 #define _EFI_PCI_BUS_H\r
 \r
-#include <FrameworkDxe.h>\r
+#include <PiDxe.h>\r
 \r
 #include <Protocol/PciIo.h>\r
 #include <Protocol/PciRootBridgeIo.h>\r
@@ -36,7 +36,7 @@ Revision History
 \r
 #include <Guid/PciOptionRomTable.h>\r
 \r
-#include <IndustryStandard/Pci23.h>\r
+#include <IndustryStandard/Pci.h>\r
 #include <IndustryStandard/Acpi.h>\r
 #include <IndustryStandard/PeImage.h>\r
 \r
@@ -50,7 +50,7 @@ Revision History
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/DevicePathLib.h>\r
 #include <Library/PcdLib.h>\r
-\r
+#include <Library/PeCoffLib.h>\r
 \r
 //\r
 // Driver Produced Protocol Prototypes\r
@@ -88,7 +88,7 @@ typedef struct {
   UINT8         Offset;\r
 } PCI_BAR;\r
 \r
-#define PCI_IO_DEVICE_SIGNATURE   EFI_SIGNATURE_32 ('p','c','i','o')\r
+#define PCI_IO_DEVICE_SIGNATURE   SIGNATURE_32 ('p','c','i','o')\r
 \r
 #define EFI_BRIDGE_IO32_DECODE_SUPPORTED        0x0001 \r
 #define EFI_BRIDGE_PMEM32_DECODE_SUPPORTED      0x0002 \r
@@ -199,13 +199,13 @@ typedef struct _PCI_IO_DEVICE {
 //\r
 // Global Variables\r
 //\r
-extern GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME_PROTOCOL gPciBusComponentName;\r
-extern GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gPciBusComponentName2;\r
+extern EFI_COMPONENT_NAME_PROTOCOL gPciBusComponentName;\r
+extern EFI_COMPONENT_NAME2_PROTOCOL  gPciBusComponentName2;\r
 extern EFI_DRIVER_BINDING_PROTOCOL  gPciBusDriverBinding;\r
 \r
 extern BOOLEAN                     gFullEnumeration;\r
-static UINT64                      gAllOne = 0xFFFFFFFFFFFFFFFFULL;\r
-static UINT64                      gAllZero   = 0;\r
+extern UINT64                      gAllOne;\r
+extern UINT64                      gAllZero;\r
 \r
 #include "PciIo.h"\r
 #include "PciCommand.h"\r
@@ -220,5 +220,6 @@ static UINT64                      gAllZero   = 0;
 \r
 #define IS_ISA_BRIDGE(_p)       IS_CLASS2 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_ISA)  \r
 #define IS_INTEL_ISA_BRIDGE(_p) (IS_CLASS2 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_BRIDGE_ISA_PDECODE) && ((_p)->Hdr.VendorId == 0x8086) && ((_p)->Hdr.DeviceId == 0x7110))\r
+#define IS_PCI_GFX(_p)     IS_CLASS2 (_p, PCI_CLASS_DISPLAY, PCI_CLASS_DISPLAY_OTHER)\r
 \r
 #endif\r