diff options
author | Tormod Volden <debian.tormod@gmail.com> | 2012-01-08 11:34:35 +0100 |
---|---|---|
committer | Tormod Volden <debian.tormod@gmail.com> | 2012-03-24 18:55:58 +0100 |
commit | 1a17d10a4130e7ccff1d9ae07c44200d0520445c (patch) | |
tree | 7012c4f136bee6efcde2cb25d2db8bfa30a285ca | |
parent | 5f0d2a32a81895ba0bf565de096cbdc8bca46c9e (diff) |
Do not use deprecated xf86PciInfo.h
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
-rw-r--r-- | src/s3v.h | 3 | ||||
-rw-r--r-- | src/s3v_accel.c | 1 | ||||
-rw-r--r-- | src/s3v_dga.c | 1 | ||||
-rw-r--r-- | src/s3v_driver.c | 5 | ||||
-rw-r--r-- | src/s3v_hwcurs.c | 1 | ||||
-rw-r--r-- | src/s3v_i2c.c | 1 | ||||
-rw-r--r-- | src/s3v_pciids.h | 18 | ||||
-rw-r--r-- | src/s3v_shadow.c | 1 | ||||
-rw-r--r-- | src/s3v_xv.c | 5 |
9 files changed, 26 insertions, 10 deletions
@@ -40,9 +40,6 @@ in this Software without prior written authorization from the XFree86 Project. /* 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/s3v_accel.c b/src/s3v_accel.c index 2e6d798..7837e4a 100644 --- a/src/s3v_accel.c +++ b/src/s3v_accel.c @@ -30,6 +30,7 @@ in this Software without prior written authorization from the XFree86 Project. #include <unistd.h> #include "s3v.h" +#include "s3v_pciids.h" #include "miline.h" /* fb includes are in s3v.h */ diff --git a/src/s3v_dga.c b/src/s3v_dga.c index 57d05ef..ecf8571 100644 --- a/src/s3v_dga.c +++ b/src/s3v_dga.c @@ -62,7 +62,6 @@ in this Software without prior written authorization from the XFree86 Project. #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "xaa.h" #include "xaalocal.h" #include "s3v.h" diff --git a/src/s3v_driver.c b/src/s3v_driver.c index 5f64be1..7064b1e 100644 --- a/src/s3v_driver.c +++ b/src/s3v_driver.c @@ -57,8 +57,9 @@ in this Software without prior written authorization from the XFree86 Project. */ - /* Most xf86 commons are already in s3v.h */ -#include "s3v.h" +/* Most xf86 commons are already in s3v.h */ +#include "s3v.h" +#include "s3v_pciids.h" #include "globals.h" diff --git a/src/s3v_hwcurs.c b/src/s3v_hwcurs.c index 53c539f..58e8fd9 100644 --- a/src/s3v_hwcurs.c +++ b/src/s3v_hwcurs.c @@ -39,6 +39,7 @@ in this Software without prior written authorization from the XFree86 Project. #include "s3v.h" +#include "s3v_pciids.h" /* protos */ diff --git a/src/s3v_i2c.c b/src/s3v_i2c.c index cbac21f..6bbfd1e 100644 --- a/src/s3v_i2c.c +++ b/src/s3v_i2c.c @@ -58,7 +58,6 @@ in this Software without prior written authorization from the XFree86 Project. #include "compiler.h" #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "vgaHW.h" diff --git a/src/s3v_pciids.h b/src/s3v_pciids.h new file mode 100644 index 0000000..5d11333 --- /dev/null +++ b/src/s3v_pciids.h @@ -0,0 +1,18 @@ +#ifndef S3V_PCIIDS_H +#define S3V_PCIIDS_H + +#define PCI_VENDOR_S3 0x5333 +#define PCI_CHIP_VIRGE 0x5631 +#define PCI_CHIP_TRIO 0x8811 +#define PCI_CHIP_TRIO64UVP 0x8814 +#define PCI_CHIP_VIRGE_VX 0x883D +#define PCI_CHIP_TRIO64V2_DXGX 0x8901 +#define PCI_CHIP_Trio3D 0x8904 +#define PCI_CHIP_VIRGE_DXGX 0x8A01 +#define PCI_CHIP_VIRGE_GX2 0x8A10 +#define PCI_CHIP_Trio3D_2X 0x8A13 +#define PCI_CHIP_VIRGE_MX 0x8C01 +#define PCI_CHIP_VIRGE_MXPLUS 0x8C02 +#define PCI_CHIP_VIRGE_MXP 0x8C03 + +#endif /* S3V_PCIIDS_H */ diff --git a/src/s3v_shadow.c b/src/s3v_shadow.c index e2e1269..82b763f 100644 --- a/src/s3v_shadow.c +++ b/src/s3v_shadow.c @@ -60,7 +60,6 @@ in this Software without prior written authorization from the XFree86 Project. #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "shadowfb.h" #include "servermd.h" diff --git a/src/s3v_xv.c b/src/s3v_xv.c index cc836d4..2466789 100644 --- a/src/s3v_xv.c +++ b/src/s3v_xv.c @@ -40,8 +40,9 @@ in this Software without prior written authorization from the XFree86 Project. #include "config.h" #endif - /* Most xf86 commons are already in s3v.h */ -#include "s3v.h" +/* Most xf86 commons are already in s3v.h */ +#include "s3v.h" +#include "s3v_pciids.h" #if 0 #define OFF_DELAY 250 /* milliseconds */ |