[PATCH xf86-video-i740] Stop using deprecated xf86PciInfo.h

Laurent Carlier lordheavym at gmail.com
Mon Nov 21 19:02:34 UTC 2016


Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
---
 src/i740.h       | 6 +++++-
 src/i740_accel.c | 1 -
 src/i740_dga.c   | 1 -
 src/i740_i2c.c   | 1 -
 src/i740_video.c | 1 -
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/i740.h b/src/i740.h
index 3723e57..3439d7d 100644
--- a/src/i740.h
+++ b/src/i740.h
@@ -37,7 +37,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "i740_pcirename.h"
 
-#include "xf86PciInfo.h"
 #include "xf86Pci.h"
 
 #include "i740_reg.h"
@@ -58,6 +57,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define OUTREG16(addr, val) *(volatile CARD16 *)(pI740->MMIOBase + (addr)) = (val)
 #define OUTREG(addr, val)   *(volatile CARD32 *)(pI740->MMIOBase + (addr)) = (val)
 
+#define PCI_VENDOR_REAL3D		0x003D
+#define PCI_CHIP_I740_PCI		0x00D1
+#define PCI_VENDOR_INTEL		0x8086
+#define PCI_CHIP_I740_AGP		0x7800
+
 typedef struct _I740Rec *I740Ptr;
 
 typedef void (*I740WriteIndexedByteFunc)(I740Ptr pI740, int addr, 
diff --git a/src/i740_accel.c b/src/i740_accel.c
index de06e07..b1e982c 100644
--- a/src/i740_accel.c
+++ b/src/i740_accel.c
@@ -42,7 +42,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "compiler.h"
 
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
 
 #include "vgaHW.h"
 
diff --git a/src/i740_dga.c b/src/i740_dga.c
index c16cce3..f1103ad 100644
--- a/src/i740_dga.c
+++ b/src/i740_dga.c
@@ -29,7 +29,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
 #include "vgaHW.h"
 #include "xf86xv.h"
 #include "i740.h"
diff --git a/src/i740_i2c.c b/src/i740_i2c.c
index e57c7b0..0ad504e 100644
--- a/src/i740_i2c.c
+++ b/src/i740_i2c.c
@@ -33,7 +33,6 @@
 #include "compiler.h"
 
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
 
 #include "vgaHW.h"
 
diff --git a/src/i740_video.c b/src/i740_video.c
index fc2d137..89d94a6 100644
--- a/src/i740_video.c
+++ b/src/i740_video.c
@@ -60,7 +60,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "compiler.h"
-#include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "xf86fbman.h"
 #include "regionstr.h"
-- 
2.10.2



More information about the xorg-devel mailing list