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

Submitted by Laurent Carlier on Nov. 21, 2016, 7:53 p.m.

Details

Message ID 20161121195303.27194-1-lordheavym@gmail.com
State Accepted
Commit b532708b75708f7d89449bb7b3b3f4f5df2bfb79
Headers show
Series "Stop using deprecated xf86PciInfo.h" ( rev: 3 ) in X.org

Browsing this patch as part of:
"Stop using deprecated xf86PciInfo.h" rev 3 in X.org
<< prev patch [1/1] next patch >>

Commit Message

Laurent Carlier Nov. 21, 2016, 7:53 p.m.
v2: Remove empty lines
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
---
 src/i128.h        | 6 ++++++
 src/i128IBMDAC.c  | 1 -
 src/i128_driver.c | 3 ---
 src/i128accel.c   | 1 -
 src/i128dga.c     | 1 -
 src/i128exa.c     | 1 -
 src/i128init.c    | 1 -
 7 files changed, 6 insertions(+), 8 deletions(-)

Patch hide | download patch | download mbox

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..d313c9d 100644
--- a/src/i128IBMDAC.c
+++ b/src/i128IBMDAC.c
@@ -27,7 +27,6 @@ 
 #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..14bf264 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -38,9 +38,6 @@ 
 
 #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..ae8dac7 100644
--- a/src/i128accel.c
+++ b/src/i128accel.c
@@ -34,7 +34,6 @@ 
 #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..713625f 100644
--- a/src/i128dga.c
+++ b/src/i128dga.c
@@ -6,7 +6,6 @@ 
 #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..94eb6ef 100644
--- a/src/i128exa.c
+++ b/src/i128exa.c
@@ -35,7 +35,6 @@ 
 #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..9d4f410 100644
--- a/src/i128init.c
+++ b/src/i128init.c
@@ -29,7 +29,6 @@ 
 
 
 #include "xf86.h"
-#include "xf86PciInfo.h"
 #include "xf86Pci.h"
 
 #include "i128.h"

Comments

Le lundi 21 novembre 2016, 20:53:03 CET Laurent Carlier a écrit :
> v2: Remove empty lines
> Signed-off-by: Laurent Carlier <lordheavym@gmail.com>

ping?
On 18/01/17 03:33 PM, Laurent Carlier wrote:
> Le lundi 21 novembre 2016, 20:53:03 CET Laurent Carlier a écrit :
>> v2: Remove empty lines
>> Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
> ping?
>
Reviewed-by: Connor Behan <connor.behan@gmail.com>