diff options
| author | Kevin Brace <kevinbrace@gmx.com> | 2018-12-18 15:30:34 -0600 |
|---|---|---|
| committer | Kevin Brace <kevinbrace@gmx.com> | 2018-12-18 15:30:34 -0600 |
| commit | 159c850ba86bd580fd3e749dd4f43e3b4228d91b (patch) | |
| tree | 734a497c8dbdcc368e8c8d3583fd68a37bcba3d8 | |
| parent | 0da14645b6bd27787164001031bafaca551fcecd (diff) | |
Discontinue the use of xf86PciInfo.h
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
| -rw-r--r-- | src/s3.h | 19 | ||||
| -rw-r--r-- | src/s3_driver.c | 1 | ||||
| -rw-r--r-- | src/s3_shadow.c | 1 |
3 files changed, 18 insertions, 3 deletions
@@ -34,7 +34,6 @@ #include "xf86.h" #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "xf86RamDac.h" #ifdef HAVE_XAA_H #include "xaa.h" @@ -50,6 +49,24 @@ #include "compat-api.h" + +#define PCI_VENDOR_S3 0x5333 + +#define PCI_CHIP_PLATO 0x0551 +#define PCI_CHIP_TRIO 0x8811 +#define PCI_CHIP_AURORA64VP 0x8812 +#define PCI_CHIP_TRIO64UVP 0x8814 +#define PCI_CHIP_868 0x8880 +#define PCI_CHIP_928 0x88B0 +#define PCI_CHIP_864_0 0x88C0 +#define PCI_CHIP_864_1 0x88C1 +#define PCI_CHIP_964_0 0x88D0 +#define PCI_CHIP_964_1 0x88D1 +#define PCI_CHIP_968 0x88F0 +#define PCI_CHIP_TRIO64V2_DXGX 0x8901 +#define PCI_CHIP_PLATO_PX 0x8902 + + typedef struct _S3RegRec { unsigned char cr31, cr32, cr33, cr34, cr3a, cr3b, cr3c; unsigned char cr3b2, cr3c2; diff --git a/src/s3_driver.c b/src/s3_driver.c index 85763ba..b3867ba 100644 --- a/src/s3_driver.c +++ b/src/s3_driver.c @@ -42,7 +42,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "xf86fbman.h" #include "xf86cmap.h" #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 diff --git a/src/s3_shadow.c b/src/s3_shadow.c index 36406dd..1c31203 100644 --- a/src/s3_shadow.c +++ b/src/s3_shadow.c @@ -34,7 +34,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" |