diff options
author | imp <imp@FreeBSD.org> | 2004-12-24 23:03:17 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2004-12-24 23:03:17 +0000 |
commit | 74b159d49712980d6819e2b6f8b6a1543c2b6ff8 (patch) | |
tree | c53bb4f609438308be1fb33d12d130bb74f2429c /sys/isa | |
parent | 5076ddfeb956d59e3a0a381938bfa73aafc9dde2 (diff) | |
download | FreeBSD-src-74b159d49712980d6819e2b6f8b6a1543c2b6ff8.zip FreeBSD-src-74b159d49712980d6819e2b6f8b6a1543c2b6ff8.tar.gz |
Get rid of #ifdef for legacy system. Move that into the MD code.
Export minimal symbols to allow this to happen.
Diffstat (limited to 'sys/isa')
-rw-r--r-- | sys/isa/isa_common.c | 11 | ||||
-rw-r--r-- | sys/isa/isa_common.h | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c index 4ff08d1..b6a8afe 100644 --- a/sys/isa/isa_common.c +++ b/sys/isa/isa_common.c @@ -81,7 +81,6 @@ static int isa_print_child(device_t bus, device_t dev); static MALLOC_DEFINE(M_ISADEV, "isadev", "ISA device"); -static devclass_t isa_devclass; static int isa_running; /* @@ -1097,20 +1096,20 @@ static device_method_t isa_methods[] = { { 0, 0 } }; -static driver_t isa_driver = { +driver_t isa_driver = { "isa", isa_methods, 1, /* no softc */ }; +devclass_t isa_devclass; + /* - * ISA can be attached to a PCI-ISA bridge or directly to the legacy device. + * ISA can be attached to a PCI-ISA bridge, or other locations on some + * platforms. */ DRIVER_MODULE(isa, isab, isa_driver, isa_devclass, 0, 0); DRIVER_MODULE(isa, eisab, isa_driver, isa_devclass, 0, 0); -#if defined(__i386__) || defined(__amd64__) -DRIVER_MODULE(isa, legacy, isa_driver, isa_devclass, 0, 0); -#endif MODULE_VERSION(isa, 1); /* diff --git a/sys/isa/isa_common.h b/sys/isa/isa_common.h index e17e82b..65e0ad5 100644 --- a/sys/isa/isa_common.h +++ b/sys/isa/isa_common.h @@ -77,3 +77,5 @@ extern int isa_teardown_intr(device_t bus, device_t child, struct resource *r, void *cookie); #endif +extern driver_t isa_driver; +extern devclass_t isa_devclass; |