From 35e00e91c81c202b223a8954e6798bff332b6ca2 Mon Sep 17 00:00:00 2001 From: peter Date: Sun, 19 Mar 2000 13:07:12 +0000 Subject: Connect the ISA and PCI compatability shims to an option. In this case it's options COMPAT_OLDISA and COMPAT_OLDPCI. This is meant to be a fairly strong incentive to update the older drivers to newbus, but doesn't (quite) leave anybody hanging with no hardware support. I was talking with a few folks and I was encouraged to simply break or disable the shims but that was a bit too drastic for my liking. --- sys/dev/pci/pci.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'sys/dev/pci/pci.c') diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 74ae9f9..faa813b 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -30,6 +30,7 @@ #include "opt_bus.h" #include "opt_simos.h" +#include "opt_compat_oldpci.h" #include #include @@ -857,6 +858,9 @@ static struct cdevsw pcicdev = { #include "pci_if.h" +static devclass_t pci_devclass; + +#ifdef COMPAT_OLDPCI /* * A simple driver to wrap the old pci driver mechanism for back-compat. */ @@ -919,8 +923,6 @@ static device_method_t pci_compat_methods[] = { { 0, 0 } }; -static devclass_t pci_devclass; - /* * Create a new style driver around each old pci driver. */ @@ -950,6 +952,7 @@ compat_pci_handler(module_t mod, int type, void *data) } return 0; } +#endif /* * New style pci driver. Parent device is either a pci-host-bridge or a -- cgit v1.1