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

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

Details

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

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

Commit Message

Laurent Carlier Nov. 21, 2016, 7:02 p.m.
Signed-off-by: Laurent Carlier <lordheavym@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(-)

Patch hide | download patch | download mbox

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"

Comments

Le lundi 21 novembre 2016, 20:02:34 CET Laurent Carlier a écrit :
> 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:02:34 CET Laurent Carlier a écrit :
>> Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
>> ---
> ping?
>
Reviewed-by: Connor Behan <connor.behan@gmail.com>