\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
#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
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
//\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 = 0xFFFFFFFFFFFFFFFF;\r
-static UINT64 gAllZero = 0;\r
+extern UINT64 gAllOne;\r
+extern UINT64 gAllZero;\r
\r
#include "PciIo.h"\r
#include "PciCommand.h"\r
#include "PciPowerManagement.h"\r
\r
\r
-#define IS_ISA_BRIDGE(_p) IS_CLASS2 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_ISA) \r
-#define IS_INTEL_ISA_BRIDGE(_p) (IS_CLASS2 (_p, PCI_CLASS_BRIDGE, PCI_CLASS_ISA_POSITIVE_DECODE) && ((_p)->Hdr.VendorId == 0x8086) && ((_p)->Hdr.DeviceId == 0x7110))\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