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

Laurent Carlier lordheavym at gmail.com
Mon Nov 21 19:18:29 UTC 2016


Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
---
 src/i128.h        | 6 ++++++
 src/i128IBMDAC.c  | 2 +-
 src/i128_driver.c | 2 +-
 src/i128accel.c   | 2 +-
 src/i128dga.c     | 2 +-
 src/i128exa.c     | 2 +-
 src/i128init.c    | 2 +-
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/i128.h b/src/i128.h
index 73739e5..64a62d4 100644
--- a/src/i128.h
+++ b/src/i128.h
@@ -36,6 +36,12 @@ struct source_format {
 
 #define I128PTR(p) ((I128Ptr)((p)->driverPrivate))
 
+#define PCI_VENDOR_NUMNINE		0x105D
+#define PCI_CHIP_I128			0x2309
+#define PCI_CHIP_I128_2			0x2339
+#define PCI_CHIP_I128_T2R		0x493D
+#define PCI_CHIP_I128_T2R4		0x5348
+
 typedef struct {
     EntityInfoPtr	pEnt;
     pciVideoPtr		PciInfo;
diff --git a/src/i128IBMDAC.c b/src/i128IBMDAC.c
index 8bd78e9..9c33b02 100644
--- a/src/i128IBMDAC.c
+++ b/src/i128IBMDAC.c
@@ -27,7 +27,7 @@
 #endif
 
 #include "xf86.h"
-#include "xf86PciInfo.h"
+
 #include "xf86Pci.h"
 #include "cursorstr.h"
 #include "servermd.h"
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 51a4135..7339dc5 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -39,7 +39,7 @@
 #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/i128accel.c b/src/i128accel.c
index fd65c97..1f2972a 100644
--- a/src/i128accel.c
+++ b/src/i128accel.c
@@ -34,7 +34,7 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
+
 
 #include "i128.h"
 #include "i128reg.h"
diff --git a/src/i128dga.c b/src/i128dga.c
index d9453bf..eb96b35 100644
--- a/src/i128dga.c
+++ b/src/i128dga.c
@@ -6,7 +6,7 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
+
 #include "i128.h"
 #include "dgaproc.h"
 
diff --git a/src/i128exa.c b/src/i128exa.c
index 13bba11..8710a34 100644
--- a/src/i128exa.c
+++ b/src/i128exa.c
@@ -35,7 +35,7 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"
-#include "xf86PciInfo.h"
+
 
 #include "i128.h"
 #include "i128reg.h"
diff --git a/src/i128init.c b/src/i128init.c
index 1a34053..e208106 100644
--- a/src/i128init.c
+++ b/src/i128init.c
@@ -29,7 +29,7 @@
 
 
 #include "xf86.h"
-#include "xf86PciInfo.h"
+
 #include "xf86Pci.h"
 
 #include "i128.h"
-- 
2.10.2



More information about the xorg-devel mailing list