diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-12-28 21:12:38 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-12-28 21:12:38 +0000 |
| commit | 8576d5dab87e7fa7038a9e5b23feac78330cfeb3 (patch) | |
| tree | adfebc10346ace120d6d57d63d5e2932981f49e2 /sys | |
| parent | 1b49ee3eb8c877858a1f6aed46946e85333e60d6 (diff) | |
Setting the service switch on 425e to select serial console shall not be
considered as forcing the console, but as a normal remote console selection.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/hp300/dev/apci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arch/hp300/dev/apci.c b/sys/arch/hp300/dev/apci.c index 091ff57066a..1961f29d10c 100644 --- a/sys/arch/hp300/dev/apci.c +++ b/sys/arch/hp300/dev/apci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apci.c,v 1.23 2005/04/22 11:59:11 miod Exp $ */ +/* $OpenBSD: apci.c,v 1.24 2005/12/28 21:12:37 miod Exp $ */ /* $NetBSD: apci.c,v 1.9 2000/11/02 00:35:05 eeh Exp $ */ /*- @@ -912,7 +912,6 @@ apcicnprobe(cp) if (badaddr((caddr_t)frodoregs) == 0 && !ISSET(frodoregs[FRODO_IISR], FRODO_IISR_SERVICE)) { cp->cn_pri = CN_REMOTE; - conforced = 1; conscode = -2; /* XXX */ } else { cp->cn_pri = CN_NORMAL; @@ -922,7 +921,7 @@ apcicnprobe(cp) * If our priority is higher than the currently-remembered * console, install ourselves. */ - if (((cn_tab == NULL) || (cp->cn_pri > cn_tab->cn_pri)) || conforced) + if (((cn_tab == NULL) || (cp->cn_pri > cn_tab->cn_pri))) cn_tab = cp; } |