Invoke hp300_cninit() twice, with a global variable letting the

console-dependent routines know which pass they are being invoked in.

The first pass is the usual console detection code. The second pass runs
after uvm is initialized, and will allow devices which need VM services to
run to claim the console.

3 files changed, 21 insertions, 3 deletions

diff --git a/sys/arch/hp300/dev/apci.c b/sys/arch/hp300/dev/apci.c
index a7f88b5ec89..cd0dddfb1e3 100644
--- a/sys/arch/hp300/dev/apci.c
+++ b/sys/arch/hp300/dev/apci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apci.c,v 1.21 2005/02/27 22:05:15 miod Exp $	*/
+/*	$OpenBSD: apci.c,v 1.22 2005/02/27 22:08:39 miod Exp $	*/
 /*	$NetBSD: apci.c,v 1.9 2000/11/02 00:35:05 eeh Exp $	*/
 
 /*-
@@ -977,6 +977,12 @@ apcicninit(cp)
 	struct consdev *cp;
 {
 
+	/*
+	 * We are not interested by the second console pass.
+	 */
+	if (consolepass != 0)
+		return;
+
 	apci_cn = (struct apciregs *)IIOV(FRODO_BASE + FRODO_APCI_OFFSET(1));
 	apciinit(apci_cn, apcidefaultrate);
 	apciconsinit = 1;
diff --git a/sys/arch/hp300/dev/dca.c b/sys/arch/hp300/dev/dca.c
index 71ccfc3e13f..4a1245c6b92 100644
--- a/sys/arch/hp300/dev/dca.c
+++ b/sys/arch/hp300/dev/dca.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dca.c,v 1.25 2005/02/14 00:52:09 miod Exp $	*/
+/*	$OpenBSD: dca.c,v 1.26 2005/02/27 22:08:39 miod Exp $	*/
 /*	$NetBSD: dca.c,v 1.35 1997/05/05 20:58:18 thorpej Exp $	*/
 
 /*
@@ -1066,6 +1066,12 @@ dcacninit(cp)
 	struct consdev *cp;
 {
 
+	/*
+	 * We are not interested by the second console pass.
+	 */
+	if (consolepass != 0)
+		return;
+
 	dca_cn = (struct dcadevice *)conaddr;
 	dcainit(dca_cn, dcadefaultrate);
 	dcaconsinit = 1;
diff --git a/sys/arch/hp300/dev/dcm.c b/sys/arch/hp300/dev/dcm.c
index 88042734066..96271a108fa 100644
--- a/sys/arch/hp300/dev/dcm.c
+++ b/sys/arch/hp300/dev/dcm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dcm.c,v 1.23 2005/02/12 18:01:08 miod Exp $	*/
+/*	$OpenBSD: dcm.c,v 1.24 2005/02/27 22:08:39 miod Exp $	*/
 /*	$NetBSD: dcm.c,v 1.41 1997/05/05 20:59:16 thorpej Exp $	*/
 
 /*
@@ -1593,6 +1593,12 @@ dcmcninit(cp)
 	struct consdev *cp;
 {
 
+	/*
+	 * We are not interested by the second console pass.
+	 */
+	if (consolepass != 0)
+		return;
+
 	dcm_cn = (struct dcmdevice *)conaddr;
 	dcminit(dcm_cn, DCMCONSPORT, dcmdefaultrate);
 	dcmconsinit = 1;