DuetPkg, MdeModulePkg: Fix several enum comparions

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

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
index fe974bee33270f75cb686853147b015fb184188f..3ddb5bfb854941ce448ec5aeddb593bf4da5e90a 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
@@ -1,7 +1,7 @@
 /*++\r
 \r
-Copyright (c) 2005 - 2007, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2005 - 2007, 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
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -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
@@ -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
@@ -204,8 +204,8 @@ extern EFI_COMPONENT_NAME2_PROTOCOL  gPciBusComponentName2;
 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