diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-01-01 11:59:41 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-01-01 11:59:41 +0000 |
| commit | 7c8c17745187f3a98406bb29f524367c37916e73 (patch) | |
| tree | 30dad47898ee31fcbac0fb74a5c5ddccaf8ce36f /sys/arch/hp300/stand/common/dcm.c | |
| parent | 2d6ec71dd3850b256841848bec15fcbbadd35579 (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/stand/common/dcm.c')
| -rw-r--r-- | sys/arch/hp300/stand/common/dcm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/arch/hp300/stand/common/dcm.c b/sys/arch/hp300/stand/common/dcm.c index 14579f1d22a..2d11221b211 100644 --- a/sys/arch/hp300/stand/common/dcm.c +++ b/sys/arch/hp300/stand/common/dcm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dcm.c,v 1.3 2005/12/31 17:59:47 miod Exp $ */ +/* $OpenBSD: dcm.c,v 1.4 2006/01/01 11:59:39 miod Exp $ */ /* $NetBSD: dcm.c,v 1.2 1997/04/14 05:58:32 scottr Exp $ */ /* @@ -62,10 +62,8 @@ dcmprobe(cp) for (hw = sc_table; hw < &sc_table[MAXCTLRS]; hw++) if (HW_ISDEV(hw, D_COMMDCM) && !badaddr((caddr_t)hw->hw_kva)) break; - if (!HW_ISDEV(hw, D_COMMDCM)) { - cp->cn_pri = CN_DEAD; + if (!HW_ISDEV(hw, D_COMMDCM)) return; - } dcmcnaddr = (struct dcmdevice *) hw->hw_kva; dcm = dcmcnaddr; @@ -77,7 +75,6 @@ dcmprobe(cp) cp->cn_pri = CN_REMOTE; break; default: - cp->cn_pri = CN_DEAD; break; } |