chips: drop usage of deprecated xf86PciInfo.h

Just takes the pci ids chips needs into the driver.

Signed-off-by: Dave Airlie <airlied@redhat.com>

9 files changed, 13 insertions, 21 deletions

diff --git a/src/ct_accel.c b/src/ct_accel.c
index c369362..e349baf 100644
--- a/src/ct_accel.c
+++ b/src/ct_accel.c
@@ -46,9 +46,6 @@
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
 /* Drivers that use XAA need this */
 #include "xf86fbman.h"
 
diff --git a/src/ct_bank.c b/src/ct_bank.c
index 3bd9c5d..0264616 100644
--- a/src/ct_bank.c
+++ b/src/ct_bank.c
@@ -47,9 +47,6 @@
 /* Everything using inb/outb, etc needs "compiler.h" */
 #include "compiler.h"
 
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
diff --git a/src/ct_cursor.c b/src/ct_cursor.c
index 6f5ebf0..2bf04f2 100644
--- a/src/ct_cursor.c
+++ b/src/ct_cursor.c
@@ -36,9 +36,6 @@
 /* Everything using inb/outb, etc needs "compiler.h" */
 #include "compiler.h"   
 
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
diff --git a/src/ct_ddc.c b/src/ct_ddc.c
index 9f64826..5e2346a 100644
--- a/src/ct_ddc.c
+++ b/src/ct_ddc.c
@@ -10,9 +10,6 @@
 /* Everything using inb/outb, etc needs "compiler.h" */
 #include "compiler.h"
 
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
diff --git a/src/ct_dga.c b/src/ct_dga.c
index bed4df0..b2f8ded 100644
--- a/src/ct_dga.c
+++ b/src/ct_dga.c
@@ -6,7 +6,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
 #include "xaa.h"
 #include "xaalocal.h"
 #include "ct_driver.h"
diff --git a/src/ct_driver.c b/src/ct_driver.c
index c0c3bce..01cff63 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -79,9 +79,6 @@
 /* Everything using inb/outb, etc needs "compiler.h" */
 #include "compiler.h"
 
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
@@ -480,6 +477,19 @@ static DisplayModeRec ChipsNTSCMode = {
 
 #ifdef XSERVER_LIBPCIACCESS
 
+#ifndef _XF86_PCIINFO_H
+#define PCI_VENDOR_CHIPSTECH		0x102C
+/* Chips & Tech */
+#define PCI_CHIP_65545			0x00D8
+#define PCI_CHIP_65548			0x00DC
+#define PCI_CHIP_65550			0x00E0
+#define PCI_CHIP_65554			0x00E4
+#define PCI_CHIP_65555			0x00E5
+#define PCI_CHIP_68554			0x00F4
+#define PCI_CHIP_69000			0x00C0
+#define PCI_CHIP_69030			0x0C30
+#endif
+
 #define CHIPS_DEVICE_MATCH(d, i) \
   { PCI_VENDOR_CHIPSTECH, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
 
diff --git a/src/ct_regs.c b/src/ct_regs.c
index e9a4c20..4446b33 100644
--- a/src/ct_regs.c
+++ b/src/ct_regs.c
@@ -58,9 +58,6 @@
 /* Everything using inb/outb, etc needs "compiler.h" */
 #include "compiler.h"
 
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
diff --git a/src/ct_shadow.c b/src/ct_shadow.c
index ad089d9..66b0ba7 100644
--- a/src/ct_shadow.c
+++ b/src/ct_shadow.c
@@ -5,7 +5,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "shadowfb.h"
 #include "servermd.h"
diff --git a/src/ct_video.c b/src/ct_video.c
index 61a90ef..248d2cf 100644
--- a/src/ct_video.c
+++ b/src/ct_video.c
@@ -6,7 +6,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "compiler.h"
-#include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "xf86fbman.h"
 #include "regionstr.h"