From b9ca15f8076e51baf519fa6a1b38a2d4abf07a99 Mon Sep 17 00:00:00 2001 From: Doug Rabson Date: Wed, 22 Jul 1998 08:34:19 +0000 Subject: [PATCH] Add ISA support. Remove mcclock hack which was only needed because ISA wasn't done yet. --- sys/alpha/alpha/autoconf.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/alpha/alpha/autoconf.c b/sys/alpha/alpha/autoconf.c index 873eb3fa2fe..6456d7de647 100644 --- a/sys/alpha/alpha/autoconf.c +++ b/sys/alpha/alpha/autoconf.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: autoconf.c,v 1.3 1998/07/05 12:10:10 dfr Exp $ + * $Id: autoconf.c,v 1.4 1998/07/12 16:07:05 dfr Exp $ */ #include @@ -52,6 +52,7 @@ SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_FIRST, configure, NULL) static void configure_finish __P((void)); static void configure_start __P((void)); +device_t isa_bus_device = 0; static void configure_start() @@ -81,15 +82,15 @@ configure(void *dummy) device_add_child(root_bus, platform.iobus, 0, 0); - /* XXX hack until I implement ISA */ - if (!strcmp(platform.iobus, "cia")) - device_add_child(root_bus, "mcclock", 0, 0); - /* XXX end hack */ - root_bus_configure(); pci_configure(); + /* + * Probe ISA devices after everything. + */ + bus_generic_attach(isa_bus_device); + configure_finish(); cninit_finish();