From bf8ae27fd2ae21d646d632fc534600f20b787ec0 Mon Sep 17 00:00:00 2001
From: Jason Downs <downsj@cvs.openbsd.org>
Date: Thu, 25 Dec 1997 06:09:53 +0000
Subject: isa_has_been_seen; NetBSD.

---
 sys/arch/i386/i386/mainbus.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'sys')

diff --git a/sys/arch/i386/i386/mainbus.c b/sys/arch/i386/i386/mainbus.c
index aa44f860efa..384c7ffc7d6 100644
--- a/sys/arch/i386/i386/mainbus.c
+++ b/sys/arch/i386/i386/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.11 1997/12/24 09:44:18 downsj Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.12 1997/12/25 06:09:52 downsj Exp $	*/
 /*	$NetBSD: mainbus.c,v 1.8 1996/04/11 22:13:37 cgd Exp $	*/
 
 /*
@@ -75,6 +75,12 @@ union mainbus_attach_args {
 #endif
 };
 
+/*
+ * This is set when the ISA bus is attached.  If it's not set by the
+ * time it's checked below, then mainbus attempts to attach an ISA.
+ */
+int     isa_has_been_seen;
+
 /*
  * Probe for the mainbus; always succeeds.
  */
@@ -131,7 +137,7 @@ mainbus_attach(parent, self, aux)
 		config_found(self, &mba.mba_eba, mainbus_print);
 	}
 
-	if (1 /* XXX ISA NOT YET SEEN */) {
+	if (isa_has_been_seen == 0) {
 		mba.mba_iba.iba_busname = "isa";
 		mba.mba_iba.iba_iot = I386_BUS_SPACE_IO;
 		mba.mba_iba.iba_memt = I386_BUS_SPACE_MEM;
-- 
cgit v1.2.3