On Sat, Nov 23, 2013 at 1:58 AM, Connor Behan <[email protected]> wrote: > It is about time we stop using this deprecated file and include pciids > locally. > > Signed-off-by: Connor Behan <[email protected]>
Reviewed-by: Alex Deucher <[email protected]> > --- > src/r128_dri.c | 1 - > src/r128_driver.c | 1 - > src/r128_probe.c | 2 -- > src/r128_probe.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 50 insertions(+), 4 deletions(-) > > diff --git a/src/r128_dri.c b/src/r128_dri.c > index 67e8d1d..ff7bbc2 100644 > --- a/src/r128_dri.c > +++ b/src/r128_dri.c > @@ -53,7 +53,6 @@ > > /* X and server generic header files */ > #include "xf86.h" > -#include "xf86PciInfo.h" > #include "windowstr.h" > > #include "shadowfb.h" > diff --git a/src/r128_driver.c b/src/r128_driver.c > index 6acdf2d..04a4537 100644 > --- a/src/r128_driver.c > +++ b/src/r128_driver.c > @@ -84,7 +84,6 @@ > /* X and server generic header files */ > #include "xf86.h" > #include "xf86_OSproc.h" > -#include "xf86PciInfo.h" > #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 > #include "xf86RAC.h" > #include "xf86Resources.h" > diff --git a/src/r128_probe.c b/src/r128_probe.c > index 7f1fbda..12e0c1c 100644 > --- a/src/r128_probe.c > +++ b/src/r128_probe.c > @@ -43,8 +43,6 @@ > #include "atipcirename.h" > > #include "xf86.h" > -#include "xf86PciInfo.h" > - > > #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 > #include "xf86Resources.h" > diff --git a/src/r128_probe.h b/src/r128_probe.h > index 41fc0e4..7b55e71 100644 > --- a/src/r128_probe.h > +++ b/src/r128_probe.h > @@ -38,6 +38,56 @@ > > #include "xf86str.h" > > +/* Chip definitions */ > +#define PCI_VENDOR_ATI 0x1002 > +#define PCI_CHIP_RAGE128LE 0x4C45 > +#define PCI_CHIP_RAGE128LF 0x4C46 > +#define PCI_CHIP_RAGE128MF 0x4D46 > +#define PCI_CHIP_RAGE128ML 0x4D4C > +#define PCI_CHIP_RAGE128PA 0x5041 > +#define PCI_CHIP_RAGE128PB 0x5042 > +#define PCI_CHIP_RAGE128PC 0x5043 > +#define PCI_CHIP_RAGE128PD 0x5044 > +#define PCI_CHIP_RAGE128PE 0x5045 > +#define PCI_CHIP_RAGE128PF 0x5046 > +#define PCI_CHIP_RAGE128PG 0x5047 > +#define PCI_CHIP_RAGE128PH 0x5048 > +#define PCI_CHIP_RAGE128PI 0x5049 > +#define PCI_CHIP_RAGE128PJ 0x504A > +#define PCI_CHIP_RAGE128PK 0x504B > +#define PCI_CHIP_RAGE128PL 0x504C > +#define PCI_CHIP_RAGE128PM 0x504D > +#define PCI_CHIP_RAGE128PN 0x504E > +#define PCI_CHIP_RAGE128PO 0x504F > +#define PCI_CHIP_RAGE128PP 0x5050 > +#define PCI_CHIP_RAGE128PQ 0x5051 > +#define PCI_CHIP_RAGE128PR 0x5052 > +#define PCI_CHIP_RAGE128PS 0x5053 > +#define PCI_CHIP_RAGE128PT 0x5054 > +#define PCI_CHIP_RAGE128PU 0x5055 > +#define PCI_CHIP_RAGE128PV 0x5056 > +#define PCI_CHIP_RAGE128PW 0x5057 > +#define PCI_CHIP_RAGE128PX 0x5058 > +#define PCI_CHIP_RAGE128RE 0x5245 > +#define PCI_CHIP_RAGE128RF 0x5246 > +#define PCI_CHIP_RAGE128RG 0x5247 > +#define PCI_CHIP_RAGE128RK 0x524B > +#define PCI_CHIP_RAGE128RL 0x524C > +#define PCI_CHIP_RAGE128SE 0x5345 > +#define PCI_CHIP_RAGE128SF 0x5346 > +#define PCI_CHIP_RAGE128SG 0x5347 > +#define PCI_CHIP_RAGE128SH 0x5348 > +#define PCI_CHIP_RAGE128SK 0x534B > +#define PCI_CHIP_RAGE128SL 0x534C > +#define PCI_CHIP_RAGE128SM 0x534D > +#define PCI_CHIP_RAGE128SN 0x534E > +#define PCI_CHIP_RAGE128TF 0x5446 > +#define PCI_CHIP_RAGE128TL 0x544C > +#define PCI_CHIP_RAGE128TR 0x5452 > +#define PCI_CHIP_RAGE128TS 0x5453 > +#define PCI_CHIP_RAGE128TT 0x5454 > +#define PCI_CHIP_RAGE128TU 0x5455 > + > extern DriverRec R128; > > typedef struct > -- > 1.8.4 > > _______________________________________________ > xorg-driver-ati mailing list > [email protected] > http://lists.x.org/mailman/listinfo/xorg-driver-ati _______________________________________________ xorg-driver-ati mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-driver-ati
