The header file is deprecated and issues a warning now. Stop using it, and move the definitions to the local tree as recommended by the warning.
Signed-off-by: Guillem Jover <[email protected]> --- src/tdfx.h | 12 +++++++++++- src/tdfx_accel.c | 3 --- src/tdfx_dri.c | 1 - 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/tdfx.h b/src/tdfx.h index 7782473..7e3be81 100644 --- a/src/tdfx.h +++ b/src/tdfx.h @@ -12,7 +12,6 @@ #include <string.h> #include <stdio.h> -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "xf86DDC.h" #include "xf86xv.h" @@ -73,6 +72,17 @@ (p)->memBase[region] #endif +#define PCI_VENDOR_3DFX 0x121A + +#define PCI_CHIP_VOODOO_GRAPHICS 0x0001 +#define PCI_CHIP_VOODOO2 0x0002 +#define PCI_CHIP_BANSHEE 0x0003 +#define PCI_CHIP_VOODOO3 0x0005 +#define PCI_CHIP_VOODOO5 0x0009 + +#define PCI_CARD_VOODOO3_2000 0x0036 +#define PCI_CARD_VOODOO3_3000 0x003A + struct _TDFXRec; typedef struct _TDFXRec *TDFXPtr; diff --git a/src/tdfx_accel.c b/src/tdfx_accel.c index 65933b4..e62e193 100644 --- a/src/tdfx_accel.c +++ b/src/tdfx_accel.c @@ -11,9 +11,6 @@ /* Drivers that need to access the PCI config space directly need this */ #include "xf86Pci.h" -/* Drivers for PCI hardware need this */ -#include "xf86PciInfo.h" - /* Drivers that use XAA need this */ #ifdef HAVE_XAA_H #include "xaalocal.h" diff --git a/src/tdfx_dri.c b/src/tdfx_dri.c index 76064c3..87ec0e8 100644 --- a/src/tdfx_dri.c +++ b/src/tdfx_dri.c @@ -5,7 +5,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "fb.h" #include "miline.h" -- 1.8.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
