From 6182fdbda82d66e069d86382987606cbba1972b1 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Fri, 16 Apr 1999 21:22:55 +0000
Subject: Bring the 'new-bus' to the i386.  This extensively changes the way
 the i386 platform boots, it is no longer ISA-centric, and is fully dynamic.
 Most old drivers compile and run without modification via 'compatability
 shims' to enable a smoother transition.  eisa, isapnp and pccard* are not yet
 using the new resource manager.  Once fully converted, all drivers will be
 loadable, including PCI and ISA.

(Some other changes appear to have snuck in, including a port of Soren's
 ATA driver to the Alpha.  Soren, back this out if you need to.)

This is a checkpoint of work-in-progress, but is quite functional.

The bulk of the work was done over the last few years by Doug Rabson and
Garrett Wollman.

Approved by:	core
---
 sys/dev/syscons/syscons.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'sys/dev/syscons')

diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index a874dbb21fc54..a2db9b489c72b 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.c,v 1.298 1999/02/05 11:52:11 yokota Exp $
+ *	$Id: syscons.c,v 1.299 1999/03/10 10:36:53 yokota Exp $
  */
 
 #include "sc.h"
@@ -1869,6 +1869,7 @@ extern struct isa_driver scdriver;
 static void
 sccnprobe(struct consdev *cp)
 {
+#if 0
     struct isa_device *dvp;
 
     /*
@@ -1885,6 +1886,13 @@ sccnprobe(struct consdev *cp)
 	return;
     }
     sckbdprobe(dvp->id_unit, dvp->id_flags, TRUE);
+#else
+    if (!scvidprobe(0, 0, TRUE)) {
+	cp->cn_pri = CN_DEAD;
+	return;
+    }
+    sckbdprobe(0, 0, TRUE);
+#endif
 
     /* initialize required fields */
     cp->cn_dev = makedev(CDEV_MAJOR, SC_CONSOLE);
-- 
cgit v1.3