From 4a1e4cb727db4d36f8b5389d6757792a42f4b671 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Sat, 8 Jan 2000 08:31:24 +0000 Subject: [PATCH] Clean up the cfgmech/pci_mechanism debris. The reason for the existance of this is no longer an issue as we have a replacement driver for the one that needed it. Reviewed by: dfr --- sys/amd64/pci/pci_bus.c | 6 ------ sys/amd64/pci/pci_cfgreg.c | 6 ------ sys/dev/pci/pcivar.h | 2 -- sys/i386/isa/pcibus.c | 6 ------ sys/i386/pci/pci_bus.c | 6 ------ sys/i386/pci/pci_cfgreg.c | 6 ------ sys/i386/pci/pci_pir.c | 6 ------ sys/pci/pcivar.h | 2 -- 8 files changed, 40 deletions(-) diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c index 7996bbfc13c..f9aa4067f2b 100644 --- a/sys/amd64/pci/pci_bus.c +++ b/sys/amd64/pci/pci_bus.c @@ -36,13 +36,7 @@ #include #include -#ifdef PCI_COMPAT -/* XXX this is a terrible hack, which keeps the Tekram AMD SCSI driver happy */ -#define cfgmech pci_mechanism -int cfgmech; -#else static int cfgmech; -#endif /* PCI_COMPAT */ static int devmax; /* enable configuration space accesses and return data port address */ diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c index 7996bbfc13c..f9aa4067f2b 100644 --- a/sys/amd64/pci/pci_cfgreg.c +++ b/sys/amd64/pci/pci_cfgreg.c @@ -36,13 +36,7 @@ #include #include -#ifdef PCI_COMPAT -/* XXX this is a terrible hack, which keeps the Tekram AMD SCSI driver happy */ -#define cfgmech pci_mechanism -int cfgmech; -#else static int cfgmech; -#endif /* PCI_COMPAT */ static int devmax; /* enable configuration space accesses and return data port address */ diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index a332fc9e382..d066860e99a 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -284,8 +284,6 @@ typedef void pci_inthand_t(void *arg); /* just copied from old PCI code for now ... */ -extern int pci_mechanism; - struct pci_device { char* pd_name; const char* (*pd_probe ) (pcici_t tag, pcidi_t type); diff --git a/sys/i386/isa/pcibus.c b/sys/i386/isa/pcibus.c index 7996bbfc13c..f9aa4067f2b 100644 --- a/sys/i386/isa/pcibus.c +++ b/sys/i386/isa/pcibus.c @@ -36,13 +36,7 @@ #include #include -#ifdef PCI_COMPAT -/* XXX this is a terrible hack, which keeps the Tekram AMD SCSI driver happy */ -#define cfgmech pci_mechanism -int cfgmech; -#else static int cfgmech; -#endif /* PCI_COMPAT */ static int devmax; /* enable configuration space accesses and return data port address */ diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c index 7996bbfc13c..f9aa4067f2b 100644 --- a/sys/i386/pci/pci_bus.c +++ b/sys/i386/pci/pci_bus.c @@ -36,13 +36,7 @@ #include #include -#ifdef PCI_COMPAT -/* XXX this is a terrible hack, which keeps the Tekram AMD SCSI driver happy */ -#define cfgmech pci_mechanism -int cfgmech; -#else static int cfgmech; -#endif /* PCI_COMPAT */ static int devmax; /* enable configuration space accesses and return data port address */ diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c index 7996bbfc13c..f9aa4067f2b 100644 --- a/sys/i386/pci/pci_cfgreg.c +++ b/sys/i386/pci/pci_cfgreg.c @@ -36,13 +36,7 @@ #include #include -#ifdef PCI_COMPAT -/* XXX this is a terrible hack, which keeps the Tekram AMD SCSI driver happy */ -#define cfgmech pci_mechanism -int cfgmech; -#else static int cfgmech; -#endif /* PCI_COMPAT */ static int devmax; /* enable configuration space accesses and return data port address */ diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c index 7996bbfc13c..f9aa4067f2b 100644 --- a/sys/i386/pci/pci_pir.c +++ b/sys/i386/pci/pci_pir.c @@ -36,13 +36,7 @@ #include #include -#ifdef PCI_COMPAT -/* XXX this is a terrible hack, which keeps the Tekram AMD SCSI driver happy */ -#define cfgmech pci_mechanism -int cfgmech; -#else static int cfgmech; -#endif /* PCI_COMPAT */ static int devmax; /* enable configuration space accesses and return data port address */ diff --git a/sys/pci/pcivar.h b/sys/pci/pcivar.h index a332fc9e382..d066860e99a 100644 --- a/sys/pci/pcivar.h +++ b/sys/pci/pcivar.h @@ -284,8 +284,6 @@ typedef void pci_inthand_t(void *arg); /* just copied from old PCI code for now ... */ -extern int pci_mechanism; - struct pci_device { char* pd_name; const char* (*pd_probe ) (pcici_t tag, pcidi_t type);