summaryrefslogtreecommitdiff
path: root/sys/arch/hp300/dev
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-01-01 11:59:41 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-01-01 11:59:41 +0000
commit7c8c17745187f3a98406bb29f524367c37916e73 (patch)
tree30dad47898ee31fcbac0fb74a5c5ddccaf8ce36f /sys/arch/hp300/dev
parent2d6ec71dd3850b256841848bec15fcbbadd35579 (diff)
Let cons_init() and cons_init_bell() initialize the whole consdev structure,
thus removing the need for drivers to initialize cn_pri to CN_DEAD when hardware probe fails.
Diffstat (limited to 'sys/arch/hp300/dev')
-rw-r--r--sys/arch/hp300/dev/apci.c3
-rw-r--r--sys/arch/hp300/dev/dca.c3
-rw-r--r--sys/arch/hp300/dev/dcm.c4
3 files changed, 3 insertions, 7 deletions
diff --git a/sys/arch/hp300/dev/apci.c b/sys/arch/hp300/dev/apci.c
index 2540cfc15a6..262ed14b345 100644
--- a/sys/arch/hp300/dev/apci.c
+++ b/sys/arch/hp300/dev/apci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apci.c,v 1.27 2005/12/30 18:14:09 miod Exp $ */
+/* $OpenBSD: apci.c,v 1.28 2006/01/01 11:59:37 miod Exp $ */
/* $NetBSD: apci.c,v 1.9 2000/11/02 00:35:05 eeh Exp $ */
/*-
@@ -887,7 +887,6 @@ apcicnprobe(cp)
/* initialize the required fields */
cp->cn_dev = makedev(apcimajor, 0); /* XXX */
- cp->cn_pri = CN_DEAD;
/*
* The APCI can only be a console on a 425e; on other 4xx
diff --git a/sys/arch/hp300/dev/dca.c b/sys/arch/hp300/dev/dca.c
index 12598c21fdc..a9c976b5297 100644
--- a/sys/arch/hp300/dev/dca.c
+++ b/sys/arch/hp300/dev/dca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dca.c,v 1.30 2005/12/31 18:13:41 miod Exp $ */
+/* $OpenBSD: dca.c,v 1.31 2006/01/01 11:59:37 miod Exp $ */
/* $NetBSD: dca.c,v 1.35 1997/05/05 20:58:18 thorpej Exp $ */
/*
@@ -1044,7 +1044,6 @@ dcacnprobe(cp)
/* initialize required fields */
cp->cn_dev = makedev(dcamajor, 0); /* XXX */
- cp->cn_pri = CN_DEAD;
console_scan(dca_console_scan, cp);
diff --git a/sys/arch/hp300/dev/dcm.c b/sys/arch/hp300/dev/dcm.c
index 206f3da52e9..d71c193b270 100644
--- a/sys/arch/hp300/dev/dcm.c
+++ b/sys/arch/hp300/dev/dcm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dcm.c,v 1.27 2005/12/31 18:13:41 miod Exp $ */
+/* $OpenBSD: dcm.c,v 1.28 2006/01/01 11:59:37 miod Exp $ */
/* $NetBSD: dcm.c,v 1.41 1997/05/05 20:59:16 thorpej Exp $ */
/*
@@ -123,7 +123,6 @@ struct dcmischeme {
*/
static struct dcmdevice *dcm_cn = NULL; /* pointer to hardware */
static int dcmconsinit; /* has been initialized */
-/* static int dcm_lastcnpri = CN_DEAD; */ /* XXX last priority */
int dcmdefaultrate = DEFAULT_BAUD_RATE;
int dcmconbrdbusy = 0;
@@ -1555,7 +1554,6 @@ dcmcnprobe(cp)
/* initialize required fields */
cp->cn_dev = makedev(dcmmajor, 0); /* XXX */
- cp->cn_pri = CN_DEAD;
console_scan(dcm_console_scan, cp);