diff options
| -rw-r--r-- | src/savage_dri.c | 1 | ||||
| -rw-r--r-- | src/savage_driver.c | 1 | ||||
| -rw-r--r-- | src/savage_driver.h | 1 | ||||
| -rw-r--r-- | src/savage_hwmc.c | 1 | ||||
| -rw-r--r-- | src/savage_i2c.c | 5 | ||||
| -rw-r--r-- | src/savage_pciids.h | 55 |
6 files changed, 56 insertions, 8 deletions
diff --git a/src/savage_dri.c b/src/savage_dri.c index 6464ffa..52a4b7c 100644 --- a/src/savage_dri.c +++ b/src/savage_dri.c @@ -34,7 +34,6 @@ #include "xaalocal.h" #include "xaarop.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "xf86fbman.h" diff --git a/src/savage_driver.c b/src/savage_driver.c index 0592232..447beec 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -56,6 +56,7 @@ #include "xf86xv.h" #include "savage_driver.h" +#include "savage_pciids.h" #include "savage_regs.h" #include "savage_bci.h" #include "savage_streams.h" diff --git a/src/savage_driver.h b/src/savage_driver.h index 1737362..6c6dda8 100644 --- a/src/savage_driver.h +++ b/src/savage_driver.h @@ -55,7 +55,6 @@ #include "xf86Resources.h" #endif #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "xf86_OSproc.h" #include "xf86Cursor.h" #include "mipointer.h" diff --git a/src/savage_hwmc.c b/src/savage_hwmc.c index 905ef87..ed881b4 100644 --- a/src/savage_hwmc.c +++ b/src/savage_hwmc.c @@ -29,7 +29,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "compiler.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "xf86fbman.h" #include "regionstr.h" diff --git a/src/savage_i2c.c b/src/savage_i2c.c index d8eb46b..b5739a2 100644 --- a/src/savage_i2c.c +++ b/src/savage_i2c.c @@ -32,11 +32,6 @@ in this Software without prior written authorization from the XFree86 Project. #include "xf86_OSproc.h" #include "compiler.h" -#include "xf86Pci.h" -#include "xf86PciInfo.h" - -#include "vgaHW.h" - #include "savage_driver.h" static void diff --git a/src/savage_pciids.h b/src/savage_pciids.h new file mode 100644 index 0000000..cad5172 --- /dev/null +++ b/src/savage_pciids.h @@ -0,0 +1,55 @@ +/* + * Copyright 2011 X.Org Foundation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name of the copyright holder(s) + * and author(s) shall not be used in advertising or otherwise to promote + * the sale, use or other dealings in this Software without prior written + * authorization from the copyright holder(s) and author(s). + */ + +#ifndef SAVAGE_PCIIDS_H +#define SAVAGE_PCIIDS_H + +#define PCI_CHIP_SAVAGE3D 0x8A20 +#define PCI_CHIP_SAVAGE3D_MV 0x8A21 +#define PCI_CHIP_SAVAGE4 0x8A22 +#define PCI_CHIP_PROSAVAGE_PM 0x8A25 +#define PCI_CHIP_PROSAVAGE_KM 0x8A26 +#define PCI_CHIP_SAVAGE_MX_MV 0x8C10 +#define PCI_CHIP_SAVAGE_MX 0x8C11 +#define PCI_CHIP_SAVAGE_IX_MV 0x8C12 +#define PCI_CHIP_SAVAGE_IX 0x8C13 +#define PCI_CHIP_SUPSAV_MX128 0x8C22 +#define PCI_CHIP_SUPSAV_MX64 0x8C24 +#define PCI_CHIP_SUPSAV_MX64C 0x8C26 +#define PCI_CHIP_SUPSAV_IX128SDR 0x8C2A +#define PCI_CHIP_SUPSAV_IX128DDR 0x8C2B +#define PCI_CHIP_SUPSAV_IX64SDR 0x8C2C +#define PCI_CHIP_SUPSAV_IX64DDR 0x8C2D +#define PCI_CHIP_SUPSAV_IXCSDR 0x8C2E +#define PCI_CHIP_SUPSAV_IXCDDR 0x8C2F +#define PCI_CHIP_S3TWISTER_P 0x8D01 +#define PCI_CHIP_S3TWISTER_K 0x8D02 +#define PCI_CHIP_PROSAVAGE_DDR 0x8D03 +#define PCI_CHIP_PROSAVAGE_DDRK 0x8D04 +#define PCI_CHIP_SAVAGE2000 0x9102 + +#endif /* SAVAGE_PCIIDS_H */ |