summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-12-28 21:37:35 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-12-28 21:37:35 +0000
commita064e17630036483fa041f07faf723183c317460 (patch)
tree4fd17175157399e031b8e70dabf7b4f0829092e3
parent297953e6fb573d72df4579aa6a76c0c8df91ce8f (diff)
...thus no need to override conscode if we are configured as console, so that
kernels with hardcoded CONSCODE value can run as advertized regardless of the service switch position.
-rw-r--r--sys/arch/hp300/dev/apci.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/arch/hp300/dev/apci.c b/sys/arch/hp300/dev/apci.c
index 1961f29d10c..28089371914 100644
--- a/sys/arch/hp300/dev/apci.c
+++ b/sys/arch/hp300/dev/apci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apci.c,v 1.24 2005/12/28 21:12:37 miod Exp $ */
+/* $OpenBSD: apci.c,v 1.25 2005/12/28 21:37:34 miod Exp $ */
/* $NetBSD: apci.c,v 1.9 2000/11/02 00:35:05 eeh Exp $ */
/*-
@@ -910,12 +910,10 @@ apcicnprobe(cp)
*/
frodoregs = (volatile u_int8_t *)IIOV(FRODO_BASE);
if (badaddr((caddr_t)frodoregs) == 0 &&
- !ISSET(frodoregs[FRODO_IISR], FRODO_IISR_SERVICE)) {
+ !ISSET(frodoregs[FRODO_IISR], FRODO_IISR_SERVICE))
cp->cn_pri = CN_REMOTE;
- conscode = -2; /* XXX */
- } else {
+ else
cp->cn_pri = CN_NORMAL;
- }
/*
* If our priority is higher than the currently-remembered