summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bsd-core/drm_drv.c4
-rw-r--r--bsd/drm_drv.h4
-rw-r--r--linux-core/Makefile5
-rw-r--r--linux-core/drmP.h12
-rw-r--r--linux-core/drm_drv.c17
-rw-r--r--linux-core/savage.h24
-rw-r--r--linux/Makefile5
-rw-r--r--linux/drmP.h12
-rw-r--r--linux/drm_drv.h17
-rw-r--r--linux/gamma.h4
-rw-r--r--linux/i810.h8
-rw-r--r--linux/i830.h7
-rw-r--r--linux/savage.h24
-rw-r--r--shared-core/tdfx_drv.h8
-rw-r--r--shared/mach64.h23
-rw-r--r--shared/mga.h6
-rw-r--r--shared/r128.h40
-rw-r--r--shared/radeon.h61
-rw-r--r--shared/sis.h11
-rw-r--r--shared/tdfx.h8
-rw-r--r--shared/via.h7
21 files changed, 42 insertions, 265 deletions
diff --git a/bsd-core/drm_drv.c b/bsd-core/drm_drv.c
index 7184e3d9..1b5d1704 100644
--- a/bsd-core/drm_drv.c
+++ b/bsd-core/drm_drv.c
@@ -225,8 +225,10 @@ static struct cdevsw DRM(cdevsw) = {
#endif
};
+#include "drm_pciids.h"
+
static drm_pci_id_list_t DRM(pciidlist)[] = {
- DRIVER_PCI_IDS
+ DRM(PCI_IDS)
};
static int DRM(probe)(device_t dev)
diff --git a/bsd/drm_drv.h b/bsd/drm_drv.h
index 7184e3d9..1b5d1704 100644
--- a/bsd/drm_drv.h
+++ b/bsd/drm_drv.h
@@ -225,8 +225,10 @@ static struct cdevsw DRM(cdevsw) = {
#endif
};
+#include "drm_pciids.h"
+
static drm_pci_id_list_t DRM(pciidlist)[] = {
- DRIVER_PCI_IDS
+ DRM(PCI_IDS)
};
static int DRM(probe)(device_t dev)
diff --git a/linux-core/Makefile b/linux-core/Makefile
index b1758884..dc21459a 100644
--- a/linux-core/Makefile
+++ b/linux-core/Makefile
@@ -208,7 +208,10 @@ SHAREDDIR := ../shared
HASSHARED := $(shell if [ -d $(SHAREDDIR) ]; then echo y; fi)
ifeq ($(HASSHARED),y)
-includes:: $(SHAREDSRC)
+includes:: $(SHAREDSRC) drm_pciids.h
+
+drm_pciids.h: $(SHAREDDIR)/drm_pciids.txt
+ sh ../scripts/create_linux_pci_lists.sh < $(SHAREDDIR)/drm_pciids.txt
$(SHAREDSRC):
@if [ -r $(SHAREDDIR)/$@ ]; then \
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 09556b89..e30dd6d9 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -255,6 +255,10 @@ static inline void class_simple_destroy(struct class_simple *cs){};
static inline struct class_simple *class_simple_create(struct module *owner, char *name) { return NULL; }
+#ifndef pci_pretty_name
+#define pci_pretty_name(x) x->name
+#endif
+
#endif
#ifndef REMAP_PAGE_RANGE_5_ARGS
@@ -423,14 +427,6 @@ do { \
typedef int drm_ioctl_t( struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg );
-typedef struct drm_pci_id_list
-{
- int vendor;
- int device;
- long driver_private;
- char *name;
-} drm_pci_id_list_t;
-
typedef struct drm_ioctl_desc {
drm_ioctl_t *func;
int auth_needed;
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 35876dc6..cdeb9b68 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -540,8 +540,10 @@ static int DRM(takedown)( drm_device_t *dev )
return 0;
}
-static drm_pci_id_list_t DRM(pciidlist)[] = {
- DRIVER_PCI_IDS
+#include "drm_pciids.h"
+
+static struct pci_device_id DRM(pciidlist)[] = {
+ DRM(PCI_IDS)
};
static int DRM(probe)(struct pci_dev *pdev)
@@ -551,17 +553,17 @@ static int DRM(probe)(struct pci_dev *pdev)
int retcode;
#endif
int i;
- char *desc = NULL;
+ int is_compat = 0;
DRM_DEBUG( "\n" );
for (i = 0; DRM(pciidlist)[i].vendor != 0; i++) {
if ((DRM(pciidlist)[i].vendor == pdev->vendor) &&
(DRM(pciidlist)[i].device == pdev->device)) {
- desc = DRM(pciidlist)[i].name;
+ is_compat = 1;
}
}
- if (desc == NULL)
+ if (is_compat == 0)
return -ENODEV;
if (DRM(numdevs) >= MAX_DEVICES)
@@ -623,7 +625,7 @@ static int DRM(probe)(struct pci_dev *pdev)
}
#endif
DRM(numdevs)++; /* no errors, mark it reserved */
-
+
DRM_INFO( "Initialized %s %d.%d.%d %s on minor %d: %s\n",
DRIVER_NAME,
DRIVER_MAJOR,
@@ -631,7 +633,8 @@ static int DRM(probe)(struct pci_dev *pdev)
DRIVER_PATCHLEVEL,
DRIVER_DATE,
dev->minor,
- desc );
+ pci_pretty_name(pdev)
+ );
DRIVER_POSTINIT();
diff --git a/linux-core/savage.h b/linux-core/savage.h
index 5ccd22d8..fb828ce6 100644
--- a/linux-core/savage.h
+++ b/linux-core/savage.h
@@ -36,28 +36,4 @@
#define __HAVE_MTRR 1
#define __HAVE_CTX_BITMAP 1
-#define DRIVER_PCI_IDS \
- {0x5333, 0x8a22, 0, "Savage4"}, \
- {0x5333, 0x8a23, 0, "Savage4"}, \
- {0x5333, 0x8c10, 0, "Savage/MX-MV"}, \
- {0x5333, 0x8c11, 0, "Savage/MX"}, \
- {0x5333, 0x8c12, 0, "Savage/IX-MV"}, \
- {0x5333, 0x8c13, 0, "Savage/IX"}, \
- {0x5333, 0x8c20, 0, "Savage 3D"}, \
- {0x5333, 0x8c21, 0, "Savage 3D/MV"}, \
- {0x5333, 0x8c22, 0, "SuperSavage MX/128"}, \
- {0x5333, 0x8c24, 0, "SuperSavage MX/64"}, \
- {0x5333, 0x8c26, 0, "SuperSavage MX/64C"}, \
- {0x5333, 0x8c2a, 0, "SuperSavage IX/128 SDR"}, \
- {0x5333, 0x8c2b, 0, "SuperSavage IX/128 DDR"}, \
- {0x5333, 0x8c2c, 0, "SuperSavage IX/64 SDR"}, \
- {0x5333, 0x8c2d, 0, "SuperSavage IX/64 DDR"}, \
- {0x5333, 0x8c2e, 0, "SuperSavage IX/C SDR"}, \
- {0x5333, 0x8c2f, 0, "SuperSavage IX/C DDR"}, \
- {0x5333, 0x8a25, 0, "ProSavage PM133"}, \
- {0x5333, 0x8a26, 0, "ProSavage KM133"}, \
- {0x5333, 0x8d01, 0, "ProSavage PN133"}, \
- {0x5333, 0x8d02, 0, "ProSavage KN133"}, \
- {0x5333, 0x8d04, 0, "ProSavage DDR"}
-
#endif
diff --git a/linux/Makefile b/linux/Makefile
index b1758884..dc21459a 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -208,7 +208,10 @@ SHAREDDIR := ../shared
HASSHARED := $(shell if [ -d $(SHAREDDIR) ]; then echo y; fi)
ifeq ($(HASSHARED),y)
-includes:: $(SHAREDSRC)
+includes:: $(SHAREDSRC) drm_pciids.h
+
+drm_pciids.h: $(SHAREDDIR)/drm_pciids.txt
+ sh ../scripts/create_linux_pci_lists.sh < $(SHAREDDIR)/drm_pciids.txt
$(SHAREDSRC):
@if [ -r $(SHAREDDIR)/$@ ]; then \
diff --git a/linux/drmP.h b/linux/drmP.h
index 09556b89..e30dd6d9 100644
--- a/linux/drmP.h
+++ b/linux/drmP.h
@@ -255,6 +255,10 @@ static inline void class_simple_destroy(struct class_simple *cs){};
static inline struct class_simple *class_simple_create(struct module *owner, char *name) { return NULL; }
+#ifndef pci_pretty_name
+#define pci_pretty_name(x) x->name
+#endif
+
#endif
#ifndef REMAP_PAGE_RANGE_5_ARGS
@@ -423,14 +427,6 @@ do { \
typedef int drm_ioctl_t( struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg );
-typedef struct drm_pci_id_list
-{
- int vendor;
- int device;
- long driver_private;
- char *name;
-} drm_pci_id_list_t;
-
typedef struct drm_ioctl_desc {
drm_ioctl_t *func;
int auth_needed;
diff --git a/linux/drm_drv.h b/linux/drm_drv.h
index 35876dc6..cdeb9b68 100644
--- a/linux/drm_drv.h
+++ b/linux/drm_drv.h
@@ -540,8 +540,10 @@ static int DRM(takedown)( drm_device_t *dev )
return 0;
}
-static drm_pci_id_list_t DRM(pciidlist)[] = {
- DRIVER_PCI_IDS
+#include "drm_pciids.h"
+
+static struct pci_device_id DRM(pciidlist)[] = {
+ DRM(PCI_IDS)
};
static int DRM(probe)(struct pci_dev *pdev)
@@ -551,17 +553,17 @@ static int DRM(probe)(struct pci_dev *pdev)
int retcode;
#endif
int i;
- char *desc = NULL;
+ int is_compat = 0;
DRM_DEBUG( "\n" );
for (i = 0; DRM(pciidlist)[i].vendor != 0; i++) {
if ((DRM(pciidlist)[i].vendor == pdev->vendor) &&
(DRM(pciidlist)[i].device == pdev->device)) {
- desc = DRM(pciidlist)[i].name;
+ is_compat = 1;
}
}
- if (desc == NULL)
+ if (is_compat == 0)
return -ENODEV;
if (DRM(numdevs) >= MAX_DEVICES)
@@ -623,7 +625,7 @@ static int DRM(probe)(struct pci_dev *pdev)
}
#endif
DRM(numdevs)++; /* no errors, mark it reserved */
-
+
DRM_INFO( "Initialized %s %d.%d.%d %s on minor %d: %s\n",
DRIVER_NAME,
DRIVER_MAJOR,
@@ -631,7 +633,8 @@ static int DRM(probe)(struct pci_dev *pdev)
DRIVER_PATCHLEVEL,
DRIVER_DATE,
dev->minor,
- desc );
+ pci_pretty_name(pdev)
+ );
DRIVER_POSTINIT();
diff --git a/linux/gamma.h b/linux/gamma.h
index d4712ef2..dcd64904 100644
--- a/linux/gamma.h
+++ b/linux/gamma.h
@@ -53,10 +53,6 @@
[DRM_IOCTL_NR(DRM_IOCTL_GAMMA_INIT)] = { gamma_dma_init, 1, 1 }, \
[DRM_IOCTL_NR(DRM_IOCTL_GAMMA_COPY)] = { gamma_dma_copy, 1, 1 }
-#define DRIVER_PCI_IDS \
- {0x3d3d, 0x0008, 0, "3DLabs GLINT Gamma G1"}, \
- {0, 0, 0, NULL}
-
#define IOCTL_TABLE_NAME DRM(ioctls)
#define IOCTL_FUNC_NAME DRM(ioctl)
diff --git a/linux/i810.h b/linux/i810.h
index ffa06c0e..aee2efff 100644
--- a/linux/i810.h
+++ b/linux/i810.h
@@ -78,14 +78,6 @@
[DRM_IOCTL_NR(DRM_IOCTL_I810_RSTATUS)] = { i810_rstatus, 1, 0 }, \
[DRM_IOCTL_NR(DRM_IOCTL_I810_FLIP)] = { i810_flip_bufs, 1, 0 }
-#define DRIVER_PCI_IDS \
- {0x8086, 0x7121, 0, "Intel i810 GMCH"}, \
- {0x8086, 0x7123, 0, "Intel i810-DC100 GMCH"}, \
- {0x8086, 0x7125, 0, "Intel i810E GMCH"}, \
- {0x8086, 0x1132, 0, "Intel i815 GMCH"}, \
- {0, 0, 0, NULL}
-
-
#define __HAVE_COUNTERS 4
#define __HAVE_COUNTER6 _DRM_STAT_IRQ
#define __HAVE_COUNTER7 _DRM_STAT_PRIMARY
diff --git a/linux/i830.h b/linux/i830.h
index 93570c92..48d9cdd0 100644
--- a/linux/i830.h
+++ b/linux/i830.h
@@ -77,13 +77,6 @@
[DRM_IOCTL_NR(DRM_IOCTL_I830_GETPARAM)] = { i830_getparam, 1, 0 }, \
[DRM_IOCTL_NR(DRM_IOCTL_I830_SETPARAM)] = { i830_setparam, 1, 0 }
-#define DRIVER_PCI_IDS \
- {0x8086, 0x3577, 0, "Intel i830M GMCH"}, \
- {0x8086, 0x2562, 0, "Intel i845G GMCH"}, \
- {0x8086, 0x3582, 0, "Intel i852GM/i855GM GMCH"}, \
- {0x8086, 0x2572, 0, "Intel i865G GMCH"}, \
- {0, 0, 0, NULL}
-
#define __HAVE_COUNTERS 4
#define __HAVE_COUNTER6 _DRM_STAT_IRQ
#define __HAVE_COUNTER7 _DRM_STAT_PRIMARY
diff --git a/linux/savage.h b/linux/savage.h
index 5ccd22d8..fb828ce6 100644
--- a/linux/savage.h
+++ b/linux/savage.h
@@ -36,28 +36,4 @@
#define __HAVE_MTRR 1
#define __HAVE_CTX_BITMAP 1
-#define DRIVER_PCI_IDS \
- {0x5333, 0x8a22, 0, "Savage4"}, \
- {0x5333, 0x8a23, 0, "Savage4"}, \
- {0x5333, 0x8c10, 0, "Savage/MX-MV"}, \
- {0x5333, 0x8c11, 0, "Savage/MX"}, \
- {0x5333, 0x8c12, 0, "Savage/IX-MV"}, \
- {0x5333, 0x8c13, 0, "Savage/IX"}, \
- {0x5333, 0x8c20, 0, "Savage 3D"}, \
- {0x5333, 0x8c21, 0, "Savage 3D/MV"}, \
- {0x5333, 0x8c22, 0, "SuperSavage MX/128"}, \
- {0x5333, 0x8c24, 0, "SuperSavage MX/64"}, \
- {0x5333, 0x8c26, 0, "SuperSavage MX/64C"}, \
- {0x5333, 0x8c2a, 0, "SuperSavage IX/128 SDR"}, \
- {0x5333, 0x8c2b, 0, "SuperSavage IX/128 DDR"}, \
- {0x5333, 0x8c2c, 0, "SuperSavage IX/64 SDR"}, \
- {0x5333, 0x8c2d, 0, "SuperSavage IX/64 DDR"}, \
- {0x5333, 0x8c2e, 0, "SuperSavage IX/C SDR"}, \
- {0x5333, 0x8c2f, 0, "SuperSavage IX/C DDR"}, \
- {0x5333, 0x8a25, 0, "ProSavage PM133"}, \
- {0x5333, 0x8a26, 0, "ProSavage KM133"}, \
- {0x5333, 0x8d01, 0, "ProSavage PN133"}, \
- {0x5333, 0x8d02, 0, "ProSavage KN133"}, \
- {0x5333, 0x8d04, 0, "ProSavage DDR"}
-
#endif
diff --git a/shared-core/tdfx_drv.h b/shared-core/tdfx_drv.h
index 642b08dc..6b067db7 100644
--- a/shared-core/tdfx_drv.h
+++ b/shared-core/tdfx_drv.h
@@ -49,12 +49,4 @@
#define DRIVER_MINOR 0
#define DRIVER_PATCHLEVEL 0
-#define DRIVER_PCI_IDS \
- {0x121a, 0x0003, 0, "3dfx Voodoo Banshee"}, \
- {0x121a, 0x0004, 0, "3dfx Voodoo3 2000"}, \
- {0x121a, 0x0005, 0, "3dfx Voodoo3 3000"}, \
- {0x121a, 0x0007, 0, "3dfx Voodoo4"}, \
- {0x121a, 0x0009, 0, "3dfx Voodoo5"}, \
- {0, 0, 0, NULL}
-
#endif
diff --git a/shared/mach64.h b/shared/mach64.h
index d081e07a..f8be3937 100644
--- a/shared/mach64.h
+++ b/shared/mach64.h
@@ -71,29 +71,6 @@
[DRM_IOCTL_NR(DRM_IOCTL_MACH64_FLUSH)] = { mach64_dma_flush, 1, 0 }, \
[DRM_IOCTL_NR(DRM_IOCTL_MACH64_GETPARAM)] = { mach64_get_param, 1, 0 }
-#define DRIVER_PCI_IDS \
- {0x1002, 0x4749, 0, "3D Rage Pro"}, \
- {0x1002, 0x4750, 0, "3D Rage Pro 215GP"}, \
- {0x1002, 0x4751, 0, "3D Rage Pro 215GQ"}, \
- {0x1002, 0x4742, 0, "3D Rage Pro AGP 1X/2X"}, \
- {0x1002, 0x4744, 0, "3D Rage Pro AGP 1X"}, \
- {0x1002, 0x4c49, 0, "3D Rage LT Pro"}, \
- {0x1002, 0x4c50, 0, "3D Rage LT Pro"}, \
- {0x1002, 0x4c51, 0, "3D Rage LT Pro"}, \
- {0x1002, 0x4c42, 0, "3D Rage LT Pro AGP-133"}, \
- {0x1002, 0x4c44, 0, "3D Rage LT Pro AGP-66"}, \
- {0x1002, 0x474c, 0, "Rage XC"}, \
- {0x1002, 0x474f, 0, "Rage XL"}, \
- {0x1002, 0x4752, 0, "Rage XL"}, \
- {0x1002, 0x4753, 0, "Rage XC"}, \
- {0x1002, 0x474d, 0, "Rage XL AGP 2X"}, \
- {0x1002, 0x474e, 0, "Rage XC AGP"}, \
- {0x1002, 0x4c52, 0, "Rage Mobility P/M"}, \
- {0x1002, 0x4c53, 0, "Rage Mobility L"}, \
- {0x1002, 0x4c4d, 0, "Rage Mobility P/M AGP 2X"}, \
- {0x1002, 0x4c4e, 0, "Rage Mobility L AGP 2X"}, \
- {0, 0, 0, NULL}
-
/* Driver customization:
*/
#define DRIVER_PRETAKEDOWN() do { \
diff --git a/shared/mga.h b/shared/mga.h
index 05fa9eb7..702857a3 100644
--- a/shared/mga.h
+++ b/shared/mga.h
@@ -64,12 +64,6 @@
[DRM_IOCTL_NR(DRM_IOCTL_MGA_BLIT)] = { mga_dma_blit, 1, 0 }, \
[DRM_IOCTL_NR(DRM_IOCTL_MGA_GETPARAM)]= { mga_getparam, 1, 0 },
-#define DRIVER_PCI_IDS \
- {0x102b, 0x0521, 0, "Matrox G200 (AGP)"}, \
- {0x102b, 0x0525, 0, "Matrox G400/G450 (AGP)"}, \
- {0x102b, 0x2527, 0, "Matrox G550 (AGP)"}, \
- {0, 0, 0, NULL}
-
#define __HAVE_COUNTERS 3
#define __HAVE_COUNTER6 _DRM_STAT_IRQ
#define __HAVE_COUNTER7 _DRM_STAT_PRIMARY
diff --git a/shared/r128.h b/shared/r128.h
index ffbe3aa8..9dfe1897 100644
--- a/shared/r128.h
+++ b/shared/r128.h
@@ -79,46 +79,6 @@
[DRM_IOCTL_NR(DRM_IOCTL_R128_INDIRECT)] = { r128_cce_indirect, 1, 1 }, \
[DRM_IOCTL_NR(DRM_IOCTL_R128_GETPARAM)] = { r128_getparam, 1, 0 },
-#define DRIVER_PCI_IDS \
- {0x1002, 0x4c45, 0, "ATI Rage 128 Mobility LE (PCI)"}, \
- {0x1002, 0x4c46, 0, "ATI Rage 128 Mobility LF (AGP)"}, \
- {0x1002, 0x4d46, 0, "ATI Rage 128 Mobility MF (AGP)"}, \
- {0x1002, 0x4d4c, 0, "ATI Rage 128 Mobility ML (AGP)"}, \
- {0x1002, 0x5041, 0, "ATI Rage 128 Pro PA (PCI)"}, \
- {0x1002, 0x5042, 0, "ATI Rage 128 Pro PB (AGP)"}, \
- {0x1002, 0x5043, 0, "ATI Rage 128 Pro PC (AGP)"}, \
- {0x1002, 0x5044, 0, "ATI Rage 128 Pro PD (PCI)"}, \
- {0x1002, 0x5045, 0, "ATI Rage 128 Pro PE (AGP)"}, \
- {0x1002, 0x5046, 0, "ATI Rage 128 Pro PF (AGP)"}, \
- {0x1002, 0x5047, 0, "ATI Rage 128 Pro PG (PCI)"}, \
- {0x1002, 0x5048, 0, "ATI Rage 128 Pro PH (AGP)"}, \
- {0x1002, 0x5049, 0, "ATI Rage 128 Pro PI (AGP)"}, \
- {0x1002, 0x504A, 0, "ATI Rage 128 Pro PJ (PCI)"}, \
- {0x1002, 0x504B, 0, "ATI Rage 128 Pro PK (AGP)"}, \
- {0x1002, 0x504C, 0, "ATI Rage 128 Pro PL (AGP)"}, \
- {0x1002, 0x504D, 0, "ATI Rage 128 Pro PM (PCI)"}, \
- {0x1002, 0x504E, 0, "ATI Rage 128 Pro PN (AGP)"}, \
- {0x1002, 0x504F, 0, "ATI Rage 128 Pro PO (AGP)"}, \
- {0x1002, 0x5050, 0, "ATI Rage 128 Pro PP (PCI)"}, \
- {0x1002, 0x5051, 0, "ATI Rage 128 Pro PQ (AGP)"}, \
- {0x1002, 0x5052, 0, "ATI Rage 128 Pro PR (PCI)"}, \
- {0x1002, 0x5053, 0, "ATI Rage 128 Pro PS (PCI)"}, \
- {0x1002, 0x5054, 0, "ATI Rage 128 Pro PT (AGP)"}, \
- {0x1002, 0x5055, 0, "ATI Rage 128 Pro PU (AGP)"}, \
- {0x1002, 0x5056, 0, "ATI Rage 128 Pro PV (PCI)"}, \
- {0x1002, 0x5057, 0, "ATI Rage 128 Pro PW (AGP)"}, \
- {0x1002, 0x5058, 0, "ATI Rage 128 Pro PX (AGP)"}, \
- {0x1002, 0x5245, 0, "ATI Rage 128 RE (PCI)"}, \
- {0x1002, 0x5246, 0, "ATI Rage 128 RF (AGP)"}, \
- {0x1002, 0x5247, 0, "ATI Rage 128 RG (AGP)"}, \
- {0x1002, 0x524b, 0, "ATI Rage 128 RK (PCI)"}, \
- {0x1002, 0x524c, 0, "ATI Rage 128 RL (AGP)"}, \
- {0x1002, 0x534d, 0, "ATI Rage 128 SM (AGP)"}, \
- {0x1002, 0x5446, 0, "ATI Rage 128 Pro Ultra TF (AGP)"}, \
- {0x1002, 0x544C, 0, "ATI Rage 128 Pro Ultra TL (AGP)"}, \
- {0x1002, 0x5452, 0, "ATI Rage 128 Pro Ultra TR (AGP)"}, \
- {0, 0, 0, NULL}
-
/* Driver customization:
*/
#define DRIVER_PRERELEASE() do { \
diff --git a/shared/radeon.h b/shared/radeon.h
index fc392fa6..77e36efc 100644
--- a/shared/radeon.h
+++ b/shared/radeon.h
@@ -113,67 +113,6 @@
[DRM_IOCTL_NR(DRM_IOCTL_RADEON_IRQ_WAIT)] = { radeon_irq_wait, 1, 0 }, \
[DRM_IOCTL_NR(DRM_IOCTL_RADEON_SETPARAM)] = { radeon_cp_setparam, 1, 0 }, \
-#define DRIVER_PCI_IDS \
- {0x1002, 0x4136, 0, "ATI Radeon RS100 IGP 320M"}, \
- {0x1002, 0x4137, 0, "ATI Radeon RS200 IGP"}, \
- {0x1002, 0x4237, 0, "ATI Radeon RS250 IGP"}, \
- {0x1002, 0x4242, 0, "ATI Radeon BB R200 AIW 8500DV"}, \
- {0x1002, 0x4242, 0, "ATI Radeon BC R200"}, \
- {0x1002, 0x4336, 0, "ATI Radeon RS100 Mobility U1"}, \
- {0x1002, 0x4337, 0, "ATI Radeon RS200 Mobility IGP 340M"}, \
- {0x1002, 0x4437, 0, "ATI Radeon RS250 Mobility IGP"}, \
- {0x1002, 0x4964, 0, "ATI Radeon Id R250 9000"}, \
- {0x1002, 0x4965, 0, "ATI Radeon Ie R250 9000"}, \
- {0x1002, 0x4966, 0, "ATI Radeon If R250 9000"}, \
- {0x1002, 0x4967, 0, "ATI Radeon Ig R250 9000"}, \
- {0x1002, 0x4C57, 0, "ATI Radeon LW Mobility 7500 M7"}, \
- {0x1002, 0x4C58, 0, "ATI Radeon LX RV200 Mobility FireGL 7800 M7"}, \
- {0x1002, 0x4C59, 0, "ATI Radeon LY Mobility M6"}, \
- {0x1002, 0x4C5A, 0, "ATI Radeon LZ Mobility M6"}, \
- {0x1002, 0x4C64, 0, "ATI Radeon Ld R250 Mobility 9000 M9"}, \
- {0x1002, 0x4C65, 0, "ATI Radeon Le R250 Mobility 9000 M9"}, \
- {0x1002, 0x4C66, 0, "ATI Radeon Lf R250 Mobility 9000 M9"}, \
- {0x1002, 0x4C67, 0, "ATI Radeon Lg R250 Mobility 9000 M9"}, \
- {0x1002, 0x5144, 0, "ATI Radeon QD R100"}, \
- {0x1002, 0x5145, 0, "ATI Radeon QE R100"}, \
- {0x1002, 0x5146, 0, "ATI Radeon QF R100"}, \
- {0x1002, 0x5147, 0, "ATI Radeon QG R100"}, \
- {0x1002, 0x5148, 0, "ATI Radeon QH R200 8500"}, \
- {0x1002, 0x5149, 0, "ATI Radeon QI R200"}, \
- {0x1002, 0x514A, 0, "ATI Radeon QJ R200"}, \
- {0x1002, 0x514B, 0, "ATI Radeon QK R200"}, \
- {0x1002, 0x514C, 0, "ATI Radeon QL R200 8500 LE"}, \
- {0x1002, 0x514D, 0, "ATI Radeon QM R200 9100"}, \
- {0x1002, 0x514E, 0, "ATI Radeon QN R200 8500 LE"}, \
- {0x1002, 0x514F, 0, "ATI Radeon QO R200 8500 LE"}, \
- {0x1002, 0x5157, 0, "ATI Radeon QW RV200 7500"}, \
- {0x1002, 0x5158, 0, "ATI Radeon QX RV200 7500"}, \
- {0x1002, 0x5159, 0, "ATI Radeon QY RV100 7000/VE"}, \
- {0x1002, 0x515A, 0, "ATI Radeon QZ RV100 7000/VE"}, \
- {0x1002, 0x5168, 0, "ATI Radeon Qh R200"}, \
- {0x1002, 0x5169, 0, "ATI Radeon Qi R200"}, \
- {0x1002, 0x516A, 0, "ATI Radeon Qj R200"}, \
- {0x1002, 0x516B, 0, "ATI Radeon Qk R200"}, \
- {0x1002, 0x516C, 0, "ATI Radeon Ql R200"}, \
- {0x1002, 0x5834, 0, "ATI Radeon RS300 IGP"}, \
- {0x1002, 0x5835, 0, "ATI Radeon RS300 Mobility IGP"}, \
- {0x1002, 0x5836, 0, "ATI Radeon RS300 IGP"}, \
- {0x1002, 0x5837, 0, "ATI Radeon RS300 IGP"}, \
- {0x1002, 0x5960, 0, "ATI Radeon RV280 9200"}, \
- {0x1002, 0x5961, 0, "ATI Radeon RV280 9200 SE"}, \
- {0x1002, 0x5962, 0, "ATI Radeon RV280 9200"}, \
- {0x1002, 0x5963, 0, "ATI Radeon RV280 9200"}, \
- {0x1002, 0x5964, 0, "ATI Radeon RV280 9200 SE"}, \
- {0x1002, 0x5968, 0, "ATI Radeon RV280 9200"}, \
- {0x1002, 0x5969, 0, "ATI Radeon RV280 9200"}, \
- {0x1002, 0x596A, 0, "ATI Radeon RV280 9200"}, \
- {0x1002, 0x596B, 0, "ATI Radeon RV280 9200"}, \
- {0x1002, 0x5c61, 0, "ATI Radeon RV280 Mobility"}, \
- {0x1002, 0x5c62, 0, "ATI Radeon RV280"}, \
- {0x1002, 0x5c63, 0, "ATI Radeon RV280 Mobility"}, \
- {0x1002, 0x5c64, 0, "ATI Radeon RV280"}, \
- {0, 0, 0, NULL}
-
#define DRIVER_FILE_FIELDS \
int64_t radeon_fb_delta; \
diff --git a/shared/sis.h b/shared/sis.h
index d29ed0dc..c6315d72 100644
--- a/shared/sis.h
+++ b/shared/sis.h
@@ -33,11 +33,7 @@
* Name it sisdrv_##x as there's a conflict with sis_free/malloc in the kernel
* that's used for fb devices
*/
-#ifdef __linux__
#define DRM(x) sisdrv_##x
-#else
-#define DRM(x) sis_##x
-#endif
/* General customization:
*/
@@ -62,13 +58,6 @@
[DRM_IOCTL_NR(DRM_IOCTL_SIS_AGP_FREE)] = { sis_ioctl_agp_free, 1, 0 }, \
[DRM_IOCTL_NR(DRM_IOCTL_SIS_FB_INIT)] = { sis_fb_init, 1, 1 }
-#define DRIVER_PCI_IDS \
- {0x1039, 0x0300, 0, "SiS 300/305"}, \
- {0x1039, 0x5300, 0, "SiS 540"}, \
- {0x1039, 0x6300, 0, "SiS 630"}, \
- {0x1039, 0x7300, 0, "SiS 730"}, \
- {0, 0, 0, NULL}
-
#define __HAVE_COUNTERS 5
/* Buffer customization:
diff --git a/shared/tdfx.h b/shared/tdfx.h
index 642b08dc..6b067db7 100644
--- a/shared/tdfx.h
+++ b/shared/tdfx.h
@@ -49,12 +49,4 @@
#define DRIVER_MINOR 0
#define DRIVER_PATCHLEVEL 0
-#define DRIVER_PCI_IDS \
- {0x121a, 0x0003, 0, "3dfx Voodoo Banshee"}, \
- {0x121a, 0x0004, 0, "3dfx Voodoo3 2000"}, \
- {0x121a, 0x0005, 0, "3dfx Voodoo3 3000"}, \
- {0x121a, 0x0007, 0, "3dfx Voodoo4"}, \
- {0x121a, 0x0009, 0, "3dfx Voodoo5"}, \
- {0, 0, 0, NULL}
-
#endif
diff --git a/shared/via.h b/shared/via.h
index 7974dfbe..46ac6536 100644
--- a/shared/via.h
+++ b/shared/via.h
@@ -52,11 +52,4 @@ extern int via_final_context(int context);
#define DRIVER_CTX_CTOR via_init_context
#define DRIVER_CTX_DTOR via_final_context
-#define DRIVER_PCI_IDS \
- {0x1106, 0x3022, 0, "VIA CLE266 3022"}, \
- {0x1106, 0x3122, 0, "VIA CLE266"}, \
- {0x1106, 0x7205, 0, "VIA KM400"}, \
- {0x1106, 0x7204, 0, "VIA K8M800"}, \
- {0, 0, 0, NULL}
-
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 17:51:03 +0000