summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/amd64/amd64/wscons_machdep.c4
-rw-r--r--sys/arch/amd64/stand/libsa/bioscons.c8
-rw-r--r--sys/arch/armish/stand/boot/ns16550.c4
-rw-r--r--sys/arch/aviion/aviion/machdep.c8
-rw-r--r--sys/arch/aviion/dev/dart.c4
-rw-r--r--sys/arch/hp300/dev/apci.c6
-rw-r--r--sys/arch/hp300/dev/dca.c6
-rw-r--r--sys/arch/hp300/dev/dcm.c6
-rw-r--r--sys/arch/hp300/hp300/wscons_machdep.c5
-rw-r--r--sys/arch/hp300/stand/common/apci.c6
-rw-r--r--sys/arch/hp300/stand/common/cons.c4
-rw-r--r--sys/arch/hp300/stand/common/dca.c6
-rw-r--r--sys/arch/hp300/stand/common/dcm.c6
-rw-r--r--sys/arch/hp300/stand/common/ite.c8
-rw-r--r--sys/arch/hppa/dev/pdc.c4
-rw-r--r--sys/arch/hppa/stand/libsa/itecons.c4
-rw-r--r--sys/arch/hppa64/dev/pdc.c4
-rw-r--r--sys/arch/hppa64/stand/libsa/itecons.c4
-rw-r--r--sys/arch/i386/i386/bios.c4
-rw-r--r--sys/arch/i386/i386/wscons_machdep.c4
-rw-r--r--sys/arch/i386/isa/pccom.c6
-rw-r--r--sys/arch/i386/stand/libsa/bioscons.c8
-rw-r--r--sys/arch/luna88k/dev/siotty.c4
-rw-r--r--sys/arch/luna88k/luna88k/machdep.c6
-rw-r--r--sys/arch/mac68k/dev/zs.c10
-rw-r--r--sys/arch/mac68k/mac68k/wscons_machdep.c6
-rw-r--r--sys/arch/macppc/dev/zs.c8
-rw-r--r--sys/arch/macppc/macppc/wscons_machdep.c4
-rw-r--r--sys/arch/macppc/pci/vgafb.c4
-rw-r--r--sys/arch/macppc/stand/Locore.c4
-rw-r--r--sys/arch/mvme68k/dev/cl.c4
-rw-r--r--sys/arch/mvme68k/dev/zs.c4
-rw-r--r--sys/arch/mvme88k/dev/cl.c4
-rw-r--r--sys/arch/mvme88k/dev/dart.c4
-rw-r--r--sys/arch/mvme88k/mvme88k/machdep.c6
-rw-r--r--sys/arch/mvmeppc/dev/bugtty.c4
-rw-r--r--sys/arch/mvmeppc/mvmeppc/machdep.c4
-rw-r--r--sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c4
-rw-r--r--sys/arch/mvmeppc/mvmeppc/wscons_machdep.c4
-rw-r--r--sys/arch/sgi/sgi/wscons_machdep.c4
-rw-r--r--sys/arch/sh/dev/scif.c6
-rw-r--r--sys/arch/solbourne/solbourne/machdep.c4
-rw-r--r--sys/arch/sparc/dev/zs.c6
-rw-r--r--sys/arch/sparc64/dev/consinit.c4
-rw-r--r--sys/arch/vax/qbus/qd.c4
-rw-r--r--sys/arch/vax/vax/gencons.c4
-rw-r--r--sys/arch/vax/vax/wscons_machdep.c4
-rw-r--r--sys/arch/vax/vsa/dz_ibus.c4
-rw-r--r--sys/arch/vax/vxt/qsc.c4
-rw-r--r--sys/arch/zaurus/stand/zboot/unixcons.c6
-rw-r--r--sys/dev/cninit.c16
-rw-r--r--sys/dev/cons.h16
-rw-r--r--sys/dev/ic/com.c8
-rw-r--r--sys/dev/wscons/wsdisplay.c4
-rw-r--r--sys/lib/libsa/cons.c6
-rw-r--r--sys/lib/libsa/unixdev.c4
56 files changed, 154 insertions, 153 deletions
diff --git a/sys/arch/amd64/amd64/wscons_machdep.c b/sys/arch/amd64/amd64/wscons_machdep.c
index df190133d93..b0fb5e2a591 100644
--- a/sys/arch/amd64/amd64/wscons_machdep.c
+++ b/sys/arch/amd64/amd64/wscons_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_machdep.c,v 1.5 2006/06/11 21:00:48 matthieu Exp $ */
+/* $OpenBSD: wscons_machdep.c,v 1.6 2008/01/23 16:37:56 jsing Exp $ */
/*
* Copyright (c) 2001 Aaron Campbell
@@ -94,7 +94,7 @@ wscnprobe(struct consdev *cp)
}
cp->cn_dev = makedev(maj, 0);
- cp->cn_pri = CN_INTERNAL;
+ cp->cn_pri = CN_MIDPRI;
}
void
diff --git a/sys/arch/amd64/stand/libsa/bioscons.c b/sys/arch/amd64/stand/libsa/bioscons.c
index 6f9e25329b9..b438a15a2af 100644
--- a/sys/arch/amd64/stand/libsa/bioscons.c
+++ b/sys/arch/amd64/stand/libsa/bioscons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bioscons.c,v 1.3 2007/04/28 19:23:10 deraadt Exp $ */
+/* $OpenBSD: bioscons.c,v 1.4 2008/01/23 16:37:56 jsing Exp $ */
/*
* Copyright (c) 1997-1999 Michael Shalayeff
@@ -48,14 +48,14 @@
void
pc_probe(struct consdev *cn)
{
- cn->cn_pri = CN_INTERNAL;
+ cn->cn_pri = CN_MIDPRI;
cn->cn_dev = makedev(12, 0);
printf(" pc%d", minor(cn->cn_dev));
#if 0
outb(IO_RTC, NVRAM_EQUIPMENT);
if ((inb(IO_RTC+1) & PRESENT_MASK) == PRESENT_MASK) {
- cn->cn_pri = CN_INTERNAL;
+ cn->cn_pri = CN_MIDPRI;
/* XXX from i386/conf.c */
cn->cn_dev = makedev(12, 0);
printf(" pc%d", minor(cn->cn_dev));
@@ -125,7 +125,7 @@ com_probe(struct consdev *cn)
for (i = 0; i < n; i++)
printf(" com%d", i);
if (n) {
- cn->cn_pri = CN_NORMAL;
+ cn->cn_pri = CN_LOWPRI;
/* XXX from i386/conf.c */
cn->cn_dev = makedev(8, 0);
}
diff --git a/sys/arch/armish/stand/boot/ns16550.c b/sys/arch/armish/stand/boot/ns16550.c
index 7f9a14e9719..36ba5602da9 100644
--- a/sys/arch/armish/stand/boot/ns16550.c
+++ b/sys/arch/armish/stand/boot/ns16550.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ns16550.c,v 1.2 2006/07/29 15:01:49 kettenis Exp $ */
+/* $OpenBSD: ns16550.c,v 1.3 2008/01/23 16:37:57 jsing Exp $ */
/* $NetBSD: ns16550.c,v 1.3 2005/12/24 20:07:03 perry Exp $ */
/*
@@ -81,7 +81,7 @@ comspeed(int speed)
void
com_probe(struct consdev *cn)
{
- cn->cn_pri = CN_NORMAL;
+ cn->cn_pri = CN_LOWPRI;
cn->cn_dev = makedev(12, 0);
}
diff --git a/sys/arch/aviion/aviion/machdep.c b/sys/arch/aviion/aviion/machdep.c
index ef2caa2556e..f38dfb87ea5 100644
--- a/sys/arch/aviion/aviion/machdep.c
+++ b/sys/arch/aviion/aviion/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.22 2008/01/13 20:20:27 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.23 2008/01/23 16:37:58 jsing Exp $ */
/*
* Copyright (c) 2007 Miodrag Vallat.
*
@@ -14,7 +14,7 @@
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
+/* $OpenBSD: machdep.c,v 1.23 2008/01/23 16:37:58 jsing Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -199,7 +199,7 @@ struct consdev bootcons = {
nullcnpollc,
NULL,
makedev(14, 0),
- CN_NORMAL
+ CN_LOWPRI
};
/*
@@ -861,7 +861,7 @@ bootcnprobe(cp)
struct consdev *cp;
{
cp->cn_dev = makedev(0, 0);
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
}
void
diff --git a/sys/arch/aviion/dev/dart.c b/sys/arch/aviion/dev/dart.c
index ece394bbe46..7be2a1336c8 100644
--- a/sys/arch/aviion/dev/dart.c
+++ b/sys/arch/aviion/dev/dart.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dart.c,v 1.3 2007/12/19 21:52:46 miod Exp $ */
+/* $OpenBSD: dart.c,v 1.4 2008/01/23 16:37:58 jsing Exp $ */
/*
* Mach Operating System
@@ -892,7 +892,7 @@ dartcnprobe(struct consdev *cp)
return;
cp->cn_dev = makedev(maj, CONS_PORT);
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
}
void
diff --git a/sys/arch/hp300/dev/apci.c b/sys/arch/hp300/dev/apci.c
index 2eabbf09cf9..58dd694c8ac 100644
--- a/sys/arch/hp300/dev/apci.c
+++ b/sys/arch/hp300/dev/apci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apci.c,v 1.30 2007/11/09 17:32:25 miod Exp $ */
+/* $OpenBSD: apci.c,v 1.31 2008/01/23 16:37:56 jsing Exp $ */
/* $NetBSD: apci.c,v 1.9 2000/11/02 00:35:05 eeh Exp $ */
/*-
@@ -906,9 +906,9 @@ apcicnprobe(cp)
frodoregs = (volatile u_int8_t *)IIOV(FRODO_BASE);
if (badaddr((caddr_t)frodoregs) == 0 &&
!ISSET(frodoregs[FRODO_IISR], FRODO_IISR_SERVICE))
- cp->cn_pri = CN_REMOTE;
+ cp->cn_pri = CN_HIGHPRI;
else
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
/*
* If our priority is higher than the currently-remembered
diff --git a/sys/arch/hp300/dev/dca.c b/sys/arch/hp300/dev/dca.c
index 2ff36491370..f44ef867920 100644
--- a/sys/arch/hp300/dev/dca.c
+++ b/sys/arch/hp300/dev/dca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dca.c,v 1.32 2007/11/09 17:32:25 miod Exp $ */
+/* $OpenBSD: dca.c,v 1.33 2008/01/23 16:37:56 jsing Exp $ */
/* $NetBSD: dca.c,v 1.35 1997/05/05 20:58:18 thorpej Exp $ */
/*
@@ -995,12 +995,12 @@ dca_console_scan(scode, va, arg)
switch (dca->dca_id) {
case DCAID0:
case DCAID1:
- pri = CN_NORMAL;
+ pri = CN_LOWPRI;
break;
case DCAID0 | DCACON:
case DCAID1 | DCACON:
- pri = CN_REMOTE;
+ pri = CN_HIGHPRI;
break;
default:
diff --git a/sys/arch/hp300/dev/dcm.c b/sys/arch/hp300/dev/dcm.c
index d71c193b270..0dc135c3d20 100644
--- a/sys/arch/hp300/dev/dcm.c
+++ b/sys/arch/hp300/dev/dcm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dcm.c,v 1.28 2006/01/01 11:59:37 miod Exp $ */
+/* $OpenBSD: dcm.c,v 1.29 2008/01/23 16:37:56 jsing Exp $ */
/* $NetBSD: dcm.c,v 1.41 1997/05/05 20:59:16 thorpej Exp $ */
/*
@@ -1507,11 +1507,11 @@ dcm_console_scan(scode, va, arg)
switch (dcm->dcm_rsid) {
case DCMID:
- pri = CN_NORMAL;
+ pri = CN_LOWPRI;
break;
case DCMID|DCMCON:
- pri = CN_REMOTE;
+ pri = CN_HIGHPRI;
break;
default:
diff --git a/sys/arch/hp300/hp300/wscons_machdep.c b/sys/arch/hp300/hp300/wscons_machdep.c
index 8a97876dde8..3a7d1d3856f 100644
--- a/sys/arch/hp300/hp300/wscons_machdep.c
+++ b/sys/arch/hp300/hp300/wscons_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_machdep.c,v 1.8 2006/12/18 18:57:26 miod Exp $ */
+/* $OpenBSD: wscons_machdep.c,v 1.9 2008/01/23 16:37:56 jsing Exp $ */
/*
* Copyright (c) 2005, Miodrag Vallat
@@ -274,7 +274,7 @@ wscnprobe(struct consdev *cp)
return;
found:
- cp->cn_pri = CN_INTERNAL;
+ cp->cn_pri = CN_MIDPRI;
#ifdef CONSCODE
if (CONSCODE == tmpconscode)
cp->cn_pri = CN_FORCED;
@@ -293,7 +293,6 @@ found:
conscode = tmpconscode;
conaddr = (caddr_t)va;
convasize = mapsize;
-
}
}
diff --git a/sys/arch/hp300/stand/common/apci.c b/sys/arch/hp300/stand/common/apci.c
index 976a26a5e59..a85c2c07ec8 100644
--- a/sys/arch/hp300/stand/common/apci.c
+++ b/sys/arch/hp300/stand/common/apci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apci.c,v 1.8 2006/08/17 06:31:10 miod Exp $ */
+/* $OpenBSD: apci.c,v 1.9 2008/01/23 16:37:56 jsing Exp $ */
/* $NetBSD: apci.c,v 1.2 1997/10/04 17:20:15 thorpej Exp $ */
/*-
@@ -106,9 +106,9 @@ apciprobe(struct consdev *cp)
frodoregs = (volatile u_int8_t *)IIOV(FRODO_BASE);
if (badaddr((caddr_t)frodoregs) == 0 &&
(frodoregs[FRODO_IISR] & FRODO_IISR_SERVICE) == 0)
- cp->cn_pri = CN_REMOTE;
+ cp->cn_pri = CN_HIGHPRI;
else
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
}
void
diff --git a/sys/arch/hp300/stand/common/cons.c b/sys/arch/hp300/stand/common/cons.c
index 9ab91a072e0..9ee2fd5ba35 100644
--- a/sys/arch/hp300/stand/common/cons.c
+++ b/sys/arch/hp300/stand/common/cons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cons.c,v 1.4 2006/08/17 06:31:10 miod Exp $ */
+/* $OpenBSD: cons.c,v 1.5 2008/01/23 16:37:56 jsing Exp $ */
/* $NetBSD: cons.c,v 1.2 1997/05/12 07:44:53 thorpej Exp $ */
/*
@@ -72,7 +72,7 @@ cninit()
noconsole = 1;
for (cp = constab; cp->cn_probe; cp++) {
(*cp->cn_probe)(cp);
- if (cp->cn_pri > CN_DEAD &&
+ if (cp->cn_pri != CN_DEAD &&
(cn_tab == NULL || cp->cn_pri > cn_tab->cn_pri))
cn_tab = cp;
}
diff --git a/sys/arch/hp300/stand/common/dca.c b/sys/arch/hp300/stand/common/dca.c
index f661b3c926d..2ade07ab9c2 100644
--- a/sys/arch/hp300/stand/common/dca.c
+++ b/sys/arch/hp300/stand/common/dca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dca.c,v 1.6 2006/08/17 06:31:10 miod Exp $ */
+/* $OpenBSD: dca.c,v 1.7 2008/01/23 16:37:56 jsing Exp $ */
/* $NetBSD: dca.c,v 1.10 1996/10/06 01:42:48 mycroft Exp $ */
/*
@@ -62,11 +62,11 @@ dcaprobe(struct consdev *cp)
switch (dca->dca_id) {
case DCAID0:
case DCAID1:
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
break;
case DCAID0 | DCACON:
case DCAID1 | DCACON:
- cp->cn_pri = CN_REMOTE;
+ cp->cn_pri = CN_HIGHPRI;
break;
default:
break;
diff --git a/sys/arch/hp300/stand/common/dcm.c b/sys/arch/hp300/stand/common/dcm.c
index e63fb9f1d97..157c938c845 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.5 2006/08/17 06:31:10 miod Exp $ */
+/* $OpenBSD: dcm.c,v 1.6 2008/01/23 16:37:56 jsing Exp $ */
/* $NetBSD: dcm.c,v 1.2 1997/04/14 05:58:32 scottr Exp $ */
/*
@@ -67,10 +67,10 @@ dcmprobe(struct consdev *cp)
dcm = dcmcnaddr;
switch (dcm->dcm_rsid) {
case DCMID:
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
break;
case DCMID|DCMCON:
- cp->cn_pri = CN_REMOTE;
+ cp->cn_pri = CN_HIGHPRI;
break;
default:
break;
diff --git a/sys/arch/hp300/stand/common/ite.c b/sys/arch/hp300/stand/common/ite.c
index 543ca060015..904251690e1 100644
--- a/sys/arch/hp300/stand/common/ite.c
+++ b/sys/arch/hp300/stand/common/ite.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite.c,v 1.7 2006/08/17 06:31:10 miod Exp $ */
+/* $OpenBSD: ite.c,v 1.8 2008/01/23 16:37:56 jsing Exp $ */
/* $NetBSD: ite.c,v 1.12 1997/01/30 10:32:55 thorpej Exp $ */
/*
@@ -189,7 +189,7 @@ iteconfig()
break;
ip = &ite_data[i];
ip->isw = &itesw[dtype];
- ip->regbase = (caddr_t)GRFIADDR;/* to get CN_INTERNAL */
+ ip->regbase = (caddr_t)GRFIADDR; /* to get CN_MIDPRI */
ip->fbbase = (caddr_t)slotno;
ip->alive = 1;
i++;
@@ -214,10 +214,10 @@ iteprobe(struct consdev *cp)
if (ip->alive == 0)
continue;
if ((int)ip->regbase == GRFIADDR) {
- pri = CN_INTERNAL;
+ pri = CN_MIDPRI;
unit = ite;
} else if (unit < 0) {
- pri = CN_NORMAL;
+ pri = CN_LOWPRI;
unit = ite;
}
}
diff --git a/sys/arch/hppa/dev/pdc.c b/sys/arch/hppa/dev/pdc.c
index 69da4292b3e..19bbd462521 100644
--- a/sys/arch/hppa/dev/pdc.c
+++ b/sys/arch/hppa/dev/pdc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pdc.c,v 1.30 2007/07/15 19:25:49 kettenis Exp $ */
+/* $OpenBSD: pdc.c,v 1.31 2008/01/23 16:37:56 jsing Exp $ */
/*
* Copyright (c) 1998-2003 Michael Shalayeff
@@ -59,7 +59,7 @@ int pdcngetc(dev_t);
void pdcnputc(dev_t, char *);
struct consdev pdccons = { NULL, NULL, pdccngetc, pdccnputc,
- nullcnpollc, NULL, makedev(22, 0), CN_NORMAL };
+ nullcnpollc, NULL, makedev(22, 0), CN_LOWPRI };
int pdcmatch(struct device *, void *, void *);
void pdcattach(struct device *, struct device *, void *);
diff --git a/sys/arch/hppa/stand/libsa/itecons.c b/sys/arch/hppa/stand/libsa/itecons.c
index 5bee2a704a2..4d11532d79a 100644
--- a/sys/arch/hppa/stand/libsa/itecons.c
+++ b/sys/arch/hppa/stand/libsa/itecons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: itecons.c,v 1.9 2005/04/07 00:21:51 mickey Exp $ */
+/* $OpenBSD: itecons.c,v 1.10 2008/01/23 16:37:56 jsing Exp $ */
/*
* Copyright (c) 1998-2004 Michael Shalayeff
@@ -95,7 +95,7 @@ ite_probe(cn)
/* morse code with the LED's?!! */
cons_pzdev->pz_iodc_io = kbd_pzdev->pz_iodc_io = NULL;
} else {
- cn->cn_pri = CN_INTERNAL;
+ cn->cn_pri = CN_MIDPRI;
cn->cn_dev = makedev(0, 0);
}
}
diff --git a/sys/arch/hppa64/dev/pdc.c b/sys/arch/hppa64/dev/pdc.c
index 2f9764f6d5c..a34cce113ba 100644
--- a/sys/arch/hppa64/dev/pdc.c
+++ b/sys/arch/hppa64/dev/pdc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pdc.c,v 1.1 2005/04/01 10:40:47 mickey Exp $ */
+/* $OpenBSD: pdc.c,v 1.2 2008/01/23 16:37:56 jsing Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -389,7 +389,7 @@ pdccnprobe(cn)
struct consdev *cn;
{
cn->cn_dev = makedev(22,0);
- cn->cn_pri = CN_NORMAL;
+ cn->cn_pri = CN_LOWPRI;
}
void
diff --git a/sys/arch/hppa64/stand/libsa/itecons.c b/sys/arch/hppa64/stand/libsa/itecons.c
index 49e4413e2d2..fd478c06268 100644
--- a/sys/arch/hppa64/stand/libsa/itecons.c
+++ b/sys/arch/hppa64/stand/libsa/itecons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: itecons.c,v 1.1 2005/04/01 10:40:48 mickey Exp $ */
+/* $OpenBSD: itecons.c,v 1.2 2008/01/23 16:37:56 jsing Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -86,7 +86,7 @@ ite_probe(cn)
/* morse code with the LED's?!! */
cons_pzdev->pz_iodc_io = kbd_pzdev->pz_iodc_io = NULL;
} else {
- cn->cn_pri = CN_INTERNAL;
+ cn->cn_pri = CN_MIDPRI;
cn->cn_dev = makedev(0, 0);
}
}
diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c
index 4820a6dc2fd..ec9c1991726 100644
--- a/sys/arch/i386/i386/bios.c
+++ b/sys/arch/i386/i386/bios.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bios.c,v 1.76 2007/12/11 17:53:16 deraadt Exp $ */
+/* $OpenBSD: bios.c,v 1.77 2008/01/23 16:37:56 jsing Exp $ */
/*
* Copyright (c) 1997-2001 Michael Shalayeff
@@ -638,7 +638,7 @@ bioscnprobe(struct consdev *cn)
if (0 && bios_call(BOOTC_CHECK, NULL))
return;
- cn->cn_pri = CN_NORMAL;
+ cn->cn_pri = CN_LOWPRI;
cn->cn_dev = makedev(48, 0);
#endif
}
diff --git a/sys/arch/i386/i386/wscons_machdep.c b/sys/arch/i386/i386/wscons_machdep.c
index 12119413052..584d76fcc0a 100644
--- a/sys/arch/i386/i386/wscons_machdep.c
+++ b/sys/arch/i386/i386/wscons_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_machdep.c,v 1.13 2006/06/11 21:00:48 matthieu Exp $ */
+/* $OpenBSD: wscons_machdep.c,v 1.14 2008/01/23 16:37:56 jsing Exp $ */
/*
* Copyright (c) 2001 Aaron Campbell
@@ -94,7 +94,7 @@ wscnprobe(struct consdev *cp)
}
cp->cn_dev = makedev(maj, 0);
- cp->cn_pri = CN_INTERNAL;
+ cp->cn_pri = CN_MIDPRI;
}
void
diff --git a/sys/arch/i386/isa/pccom.c b/sys/arch/i386/isa/pccom.c
index 4f4f039e4c9..74931000a3f 100644
--- a/sys/arch/i386/isa/pccom.c
+++ b/sys/arch/i386/isa/pccom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pccom.c,v 1.61 2007/05/09 14:32:17 deraadt Exp $ */
+/* $OpenBSD: pccom.c,v 1.62 2008/01/23 16:37:56 jsing Exp $ */
/* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */
/*
@@ -1516,9 +1516,9 @@ comcnprobe(struct consdev *cp)
/* initialize required fields */
cp->cn_dev = makedev(commajor, CONUNIT);
#if defined(COMCONSOLE) || defined(PCCOMCONSOLE)
- cp->cn_pri = CN_REMOTE; /* Force a serial port console */
+ cp->cn_pri = CN_HIGHPRI; /* Force a serial port console */
#else
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
#endif
}
diff --git a/sys/arch/i386/stand/libsa/bioscons.c b/sys/arch/i386/stand/libsa/bioscons.c
index 9447abdadf4..2203ae74912 100644
--- a/sys/arch/i386/stand/libsa/bioscons.c
+++ b/sys/arch/i386/stand/libsa/bioscons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bioscons.c,v 1.29 2007/04/27 10:08:34 tom Exp $ */
+/* $OpenBSD: bioscons.c,v 1.30 2008/01/23 16:37:56 jsing Exp $ */
/*
* Copyright (c) 1997-1999 Michael Shalayeff
@@ -49,14 +49,14 @@
void
pc_probe(struct consdev *cn)
{
- cn->cn_pri = CN_INTERNAL;
+ cn->cn_pri = CN_MIDPRI;
cn->cn_dev = makedev(12, 0);
printf(" pc%d", minor(cn->cn_dev));
#if 0
outb(IO_RTC, NVRAM_EQUIPMENT);
if ((inb(IO_RTC+1) & PRESENT_MASK) == PRESENT_MASK) {
- cn->cn_pri = CN_INTERNAL;
+ cn->cn_pri = CN_MIDPRI;
/* XXX from i386/conf.c */
cn->cn_dev = makedev(12, 0);
printf(" pc%d", minor(cn->cn_dev));
@@ -127,7 +127,7 @@ com_probe(struct consdev *cn)
for (i = 0; i < n; i++)
printf(" com%d", i);
if (n) {
- cn->cn_pri = CN_NORMAL;
+ cn->cn_pri = CN_LOWPRI;
/* XXX from i386/conf.c */
cn->cn_dev = makedev(8, 0);
}
diff --git a/sys/arch/luna88k/dev/siotty.c b/sys/arch/luna88k/dev/siotty.c
index b97fba4218e..31a5aeb21c7 100644
--- a/sys/arch/luna88k/dev/siotty.c
+++ b/sys/arch/luna88k/dev/siotty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: siotty.c,v 1.5 2007/02/14 01:12:16 jsg Exp $ */
+/* $OpenBSD: siotty.c,v 1.6 2008/01/23 16:37:56 jsing Exp $ */
/* $NetBSD: siotty.c,v 1.9 2002/03/17 19:40:43 atatat Exp $ */
/*-
@@ -602,7 +602,7 @@ struct consdev syscons = {
nullcnpollc,
NULL,
NODEV,
- CN_REMOTE,
+ CN_HIGHPRI,
};
/* EXPORT */ void
diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c
index 27e47324e77..bb6b17b149f 100644
--- a/sys/arch/luna88k/luna88k/machdep.c
+++ b/sys/arch/luna88k/luna88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.55 2008/01/13 20:20:29 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.56 2008/01/23 16:37:56 jsing Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -250,7 +250,7 @@ struct consdev romttycons = {
nullcnpollc,
NULL,
makedev(14, 0),
- CN_NORMAL,
+ CN_LOWPRI,
};
/*
@@ -1083,7 +1083,7 @@ romttycnprobe(cp)
struct consdev *cp;
{
cp->cn_dev = makedev(14, 0);
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
}
void
diff --git a/sys/arch/mac68k/dev/zs.c b/sys/arch/mac68k/dev/zs.c
index 749a104f753..b1af641730f 100644
--- a/sys/arch/mac68k/dev/zs.c
+++ b/sys/arch/mac68k/dev/zs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zs.c,v 1.25 2007/11/24 12:59:28 jmc Exp $ */
+/* $OpenBSD: zs.c,v 1.26 2008/01/23 16:37:56 jsing Exp $ */
/* $NetBSD: zs.c,v 1.19 1998/01/12 19:22:18 thorpej Exp $ */
/*
@@ -944,8 +944,8 @@ zscnsetup()
* be the console (as defined in mac68k/conf.c) gets probed. The probe
* fills in the consdev structure. Important parts are the device #,
* and the console priority. Values are CN_DEAD (don't touch me),
- * CN_NORMAL (I'm here, but elsewhere might be better), CN_INTERNAL
- * (the video, better than CN_NORMAL), and CN_REMOTE (pick me!)
+ * CN_LOWPRI (I'm here, but elsewhere might be better), CN_MIDPRI
+ * (the video, better than CN_LOWPRI), and CN_HIGHPRI (pick me!)
*
* As the mac's a bit different, we do extra work here. We mainly check
* to see if we have serial echo going on. Also chould check for default
@@ -963,9 +963,9 @@ zscnprobe(struct consdev * cp)
}
}
if (maj != nchrdev) {
- cp->cn_pri = CN_NORMAL; /* Lower than CN_INTERNAL */
+ cp->cn_pri = CN_LOWPRI;
if (mac68k_machine.serial_console != 0) {
- cp->cn_pri = CN_REMOTE; /* Higher than CN_INTERNAL */
+ cp->cn_pri = CN_HIGHPRI;
mac68k_machine.serial_boot_echo =0;
}
diff --git a/sys/arch/mac68k/mac68k/wscons_machdep.c b/sys/arch/mac68k/mac68k/wscons_machdep.c
index 1d8b442f829..7771cfeedb8 100644
--- a/sys/arch/mac68k/mac68k/wscons_machdep.c
+++ b/sys/arch/mac68k/mac68k/wscons_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_machdep.c,v 1.5 2006/01/18 23:21:17 miod Exp $ */
+/* $OpenBSD: wscons_machdep.c,v 1.6 2008/01/23 16:37:56 jsing Exp $ */
/* $NetBSD: maccons.c,v 1.5 2005/01/15 16:00:59 chs Exp $ */
/*
@@ -62,7 +62,7 @@ wscnprobe(struct consdev *cp)
#endif
cp->cn_dev = NODEV;
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
#if NWSDISPLAY > 0
unit = 0;
@@ -71,7 +71,7 @@ wscnprobe(struct consdev *cp)
break;
if (maj != nchrdev) {
- cp->cn_pri = CN_INTERNAL;
+ cp->cn_pri = CN_MIDPRI;
cp->cn_dev = makedev(maj, unit);
}
#endif
diff --git a/sys/arch/macppc/dev/zs.c b/sys/arch/macppc/dev/zs.c
index 9536f02f880..3842224d44c 100644
--- a/sys/arch/macppc/dev/zs.c
+++ b/sys/arch/macppc/dev/zs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zs.c,v 1.15 2007/10/22 14:46:46 jsing Exp $ */
+/* $OpenBSD: zs.c,v 1.16 2008/01/23 16:37:56 jsing Exp $ */
/* $NetBSD: zs.c,v 1.17 2001/06/19 13:42:15 wiz Exp $ */
/*
@@ -946,8 +946,8 @@ static int stdin, stdout;
* be the console (as defined in mac68k/conf.c) gets probed. The probe
* fills in the consdev structure. Important parts are the device #,
* and the console priority. Values are CN_DEAD (don't touch me),
- * CN_NORMAL (I'm here, but elsewhere might be better), CN_INTERNAL
- * (the video, better than CN_NORMAL), and CN_REMOTE (pick me!)
+ * CN_LOWPRI (I'm here, but elsewhere might be better), CN_MIDPRI
+ * (the video, better than CN_LOWPRI), and CN_HIGHPRI (pick me!)
*
* As the mac's a bit different, we do extra work here. We mainly check
* to see if we have serial echo going on. Also chould check for default
@@ -1081,7 +1081,7 @@ zscnprobe(cp)
break;
cp->cn_dev = makedev(maj, unit);
- cp->cn_pri = CN_REMOTE;
+ cp->cn_pri = CN_HIGHPRI;
}
diff --git a/sys/arch/macppc/macppc/wscons_machdep.c b/sys/arch/macppc/macppc/wscons_machdep.c
index 7c51e2d0838..24a823f193f 100644
--- a/sys/arch/macppc/macppc/wscons_machdep.c
+++ b/sys/arch/macppc/macppc/wscons_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_machdep.c,v 1.5 2004/10/05 14:33:16 miod Exp $ */
+/* $OpenBSD: wscons_machdep.c,v 1.6 2008/01/23 16:37:56 jsing Exp $ */
/*
* Copyright (c) 2001 Aaron Campbell
@@ -62,7 +62,7 @@ wscnprobe(struct consdev *cp)
}
cp->cn_dev = makedev(maj, 0);
- cp->cn_pri = CN_INTERNAL;
+ cp->cn_pri = CN_MIDPRI;
}
void
diff --git a/sys/arch/macppc/pci/vgafb.c b/sys/arch/macppc/pci/vgafb.c
index 78d7b73f692..01388b1452a 100644
--- a/sys/arch/macppc/pci/vgafb.c
+++ b/sys/arch/macppc/pci/vgafb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vgafb.c,v 1.33 2006/12/17 22:18:14 miod Exp $ */
+/* $OpenBSD: vgafb.c,v 1.34 2008/01/23 16:37:57 jsing Exp $ */
/* $NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $ */
/*
@@ -396,7 +396,7 @@ vgafb_cnprobe(struct consdev *cp)
if (cons_displaytype != 1)
return;
- cp->cn_pri = CN_INTERNAL;
+ cp->cn_pri = CN_MIDPRI;
}
void
diff --git a/sys/arch/macppc/stand/Locore.c b/sys/arch/macppc/stand/Locore.c
index f5dec3864cb..46664f4daef 100644
--- a/sys/arch/macppc/stand/Locore.c
+++ b/sys/arch/macppc/stand/Locore.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: Locore.c,v 1.13 2007/06/23 18:51:45 drahn Exp $ */
+/* $OpenBSD: Locore.c,v 1.14 2008/01/23 16:37:57 jsing Exp $ */
/* $NetBSD: Locore.c,v 1.1 1997/04/16 20:29:11 thorpej Exp $ */
/*
@@ -533,7 +533,7 @@ getchar()
void
ofc_probe(struct consdev *cn)
{
- cn->cn_pri = CN_NORMAL;
+ cn->cn_pri = CN_LOWPRI;
cn->cn_dev = makedev(0,0); /* WTF */
}
diff --git a/sys/arch/mvme68k/dev/cl.c b/sys/arch/mvme68k/dev/cl.c
index da5609800c7..6fdc28fd6a2 100644
--- a/sys/arch/mvme68k/dev/cl.c
+++ b/sys/arch/mvme68k/dev/cl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl.c,v 1.43 2006/06/11 20:46:50 miod Exp $ */
+/* $OpenBSD: cl.c,v 1.44 2008/01/23 16:37:57 jsing Exp $ */
/*
* Copyright (c) 1995 Dale Rahn. All rights reserved.
@@ -939,7 +939,7 @@ clcnprobe(cp)
if (cdevsw[maj].d_open == clopen)
break;
cp->cn_dev = makedev (maj, 0);
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
}
void
diff --git a/sys/arch/mvme68k/dev/zs.c b/sys/arch/mvme68k/dev/zs.c
index 4ec1daa2049..c033c859a90 100644
--- a/sys/arch/mvme68k/dev/zs.c
+++ b/sys/arch/mvme68k/dev/zs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zs.c,v 1.25 2006/06/11 20:46:50 miod Exp $ */
+/* $OpenBSD: zs.c,v 1.26 2008/01/23 16:37:57 jsing Exp $ */
/*
* Copyright (c) 2000 Steve Murphree, Jr.
@@ -1011,7 +1011,7 @@ zscnprobe(cp)
break;
cp->cn_dev = makedev(maj, 0);
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
}
/* initialize the keyboard for use as the console */
diff --git a/sys/arch/mvme88k/dev/cl.c b/sys/arch/mvme88k/dev/cl.c
index 010afea9399..397995ca714 100644
--- a/sys/arch/mvme88k/dev/cl.c
+++ b/sys/arch/mvme88k/dev/cl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl.c,v 1.52 2006/05/08 14:36:10 miod Exp $ */
+/* $OpenBSD: cl.c,v 1.53 2008/01/23 16:37:57 jsing Exp $ */
/*
* Copyright (c) 1995 Dale Rahn. All rights reserved.
@@ -901,7 +901,7 @@ clcnprobe(cp)
return;
cp->cn_dev = makedev(maj, 0);
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
}
void
diff --git a/sys/arch/mvme88k/dev/dart.c b/sys/arch/mvme88k/dev/dart.c
index c2d443aaf99..f96fd2f9878 100644
--- a/sys/arch/mvme88k/dev/dart.c
+++ b/sys/arch/mvme88k/dev/dart.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dart.c,v 1.50 2007/12/27 23:17:53 miod Exp $ */
+/* $OpenBSD: dart.c,v 1.51 2008/01/23 16:37:57 jsing Exp $ */
/*
* Mach Operating System
@@ -913,7 +913,7 @@ dartcnprobe(struct consdev *cp)
return;
cp->cn_dev = makedev(maj, CONS_PORT);
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
}
void
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 9ea695747f5..ea7cd4553fa 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.209 2008/01/13 20:20:29 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.210 2008/01/23 16:37:57 jsing Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -190,7 +190,7 @@ struct consdev bootcons = {
bootcnpollc,
NULL,
makedev(14, 0),
- CN_NORMAL,
+ CN_LOWPRI,
};
/*
@@ -1087,7 +1087,7 @@ bootcnprobe(cp)
struct consdev *cp;
{
cp->cn_dev = makedev(14, 0);
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
}
void
diff --git a/sys/arch/mvmeppc/dev/bugtty.c b/sys/arch/mvmeppc/dev/bugtty.c
index 065c3aa782d..a66233cd135 100644
--- a/sys/arch/mvmeppc/dev/bugtty.c
+++ b/sys/arch/mvmeppc/dev/bugtty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bugtty.c,v 1.10 2004/05/14 20:38:32 miod Exp $ */
+/* $OpenBSD: bugtty.c,v 1.11 2008/01/23 16:37:57 jsing Exp $ */
/* Copyright (c) 1998 Steve Murphree, Jr.
* Copyright (c) 1995 Dale Rahn.
@@ -440,7 +440,7 @@ bugttycnprobe(cp)
break;
cp->cn_dev = makedev(maj, 0);
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
}
void
diff --git a/sys/arch/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c
index fd2efae5e55..98a3a32b27c 100644
--- a/sys/arch/mvmeppc/mvmeppc/machdep.c
+++ b/sys/arch/mvmeppc/mvmeppc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.54 2007/11/04 13:43:39 martin Exp $ */
+/* $OpenBSD: machdep.c,v 1.55 2008/01/23 16:37:57 jsing Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@@ -104,7 +104,7 @@ static struct consdev bootcons = {
bootcnpollc,
NULL,
makedev(14, 0),
- CN_NORMAL,
+ CN_LOWPRI,
};
/*
diff --git a/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c b/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c
index a898fe8bb03..fad9b92ab8f 100644
--- a/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c
+++ b/sys/arch/mvmeppc/mvmeppc/ppc1_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ppc1_machdep.c,v 1.17 2007/11/04 13:43:39 martin Exp $ */
+/* $OpenBSD: ppc1_machdep.c,v 1.18 2008/01/23 16:37:57 jsing Exp $ */
/* $NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */
/*
@@ -365,7 +365,7 @@ void
bootcnprobe(struct consdev *cp)
{
cp->cn_dev = makedev(14, 0);
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
}
void
diff --git a/sys/arch/mvmeppc/mvmeppc/wscons_machdep.c b/sys/arch/mvmeppc/mvmeppc/wscons_machdep.c
index d55fea10a6f..d539483beef 100644
--- a/sys/arch/mvmeppc/mvmeppc/wscons_machdep.c
+++ b/sys/arch/mvmeppc/mvmeppc/wscons_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_machdep.c,v 1.4 2004/10/05 14:33:17 miod Exp $ */
+/* $OpenBSD: wscons_machdep.c,v 1.5 2008/01/23 16:37:57 jsing Exp $ */
/*
* Copyright (c) 2001 Aaron Campbell
@@ -62,7 +62,7 @@ wscnprobe(cp)
}
cp->cn_dev = makedev(maj, 0);
- cp->cn_pri = CN_INTERNAL;
+ cp->cn_pri = CN_MIDPRI;
}
void
diff --git a/sys/arch/sgi/sgi/wscons_machdep.c b/sys/arch/sgi/sgi/wscons_machdep.c
index ebe0b187aa8..998648a1f7e 100644
--- a/sys/arch/sgi/sgi/wscons_machdep.c
+++ b/sys/arch/sgi/sgi/wscons_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_machdep.c,v 1.2 2007/12/31 12:46:14 jsing Exp $ */
+/* $OpenBSD: wscons_machdep.c,v 1.3 2008/01/23 16:37:56 jsing Exp $ */
/*
* Copyright (c) 2001 Aaron Campbell
@@ -87,7 +87,7 @@ wscnprobe(struct consdev *cp)
if (strncmp(bios_console, "video", 5) == 0)
cp->cn_pri = CN_FORCED;
else
- cp->cn_pri = CN_INTERNAL;
+ cp->cn_pri = CN_MIDPRI;
}
#endif
break;
diff --git a/sys/arch/sh/dev/scif.c b/sys/arch/sh/dev/scif.c
index 70966381bc2..034c185197e 100644
--- a/sys/arch/sh/dev/scif.c
+++ b/sys/arch/sh/dev/scif.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scif.c,v 1.4 2006/11/20 17:53:16 drahn Exp $ */
+/* $OpenBSD: scif.c,v 1.5 2008/01/23 16:37:58 jsing Exp $ */
/* $NetBSD: scif.c,v 1.47 2006/07/23 22:06:06 ad Exp $ */
/*-
@@ -1360,9 +1360,9 @@ scifcnprobe(struct consdev *cp)
cp->cn_dev = makedev(maj, 0);
#ifdef SCIFCONSOLE
- cp->cn_pri = CN_REMOTE;
+ cp->cn_pri = CN_HIGHPRI;
#else
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
#endif
}
diff --git a/sys/arch/solbourne/solbourne/machdep.c b/sys/arch/solbourne/solbourne/machdep.c
index 9fa6c9b9976..9b5701bbb33 100644
--- a/sys/arch/solbourne/solbourne/machdep.c
+++ b/sys/arch/solbourne/solbourne/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.4 2007/05/29 20:36:48 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.5 2008/01/23 16:37:57 jsing Exp $ */
/* OpenBSD: machdep.c,v 1.105 2005/04/11 15:13:01 deraadt Exp */
/*
@@ -806,7 +806,7 @@ void
earlycnprobe(struct consdev *cn)
{
cn->cn_dev = makedev(0, 0);
- cn->cn_pri = CN_INTERNAL;
+ cn->cn_pri = CN_MIDPRI;
}
void
diff --git a/sys/arch/sparc/dev/zs.c b/sys/arch/sparc/dev/zs.c
index 9726606b384..fbbfcf9bc14 100644
--- a/sys/arch/sparc/dev/zs.c
+++ b/sys/arch/sparc/dev/zs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zs.c,v 1.44 2007/10/22 14:46:46 jsing Exp $ */
+/* $OpenBSD: zs.c,v 1.45 2008/01/23 16:37:57 jsing Exp $ */
/* $NetBSD: zs.c,v 1.50 1997/10/18 00:00:40 gwr Exp $ */
/*-
@@ -829,7 +829,7 @@ zscnprobe(cn)
struct consdev *cn;
{
cn->cn_dev = makedev(zs_major, zstty_unit);
- cn->cn_pri = CN_REMOTE;
+ cn->cn_pri = CN_HIGHPRI;
}
void
@@ -908,7 +908,7 @@ promcnprobe(cn)
struct consdev *cn;
{
cn->cn_dev = makedev(0, 0);
- cn->cn_pri = CN_INTERNAL;
+ cn->cn_pri = CN_MIDPRI;
}
void
diff --git a/sys/arch/sparc64/dev/consinit.c b/sys/arch/sparc64/dev/consinit.c
index caeb6060b39..903993316d5 100644
--- a/sys/arch/sparc64/dev/consinit.c
+++ b/sys/arch/sparc64/dev/consinit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: consinit.c,v 1.12 2007/11/14 20:43:12 kettenis Exp $ */
+/* $OpenBSD: consinit.c,v 1.13 2008/01/23 16:37:57 jsing Exp $ */
/* $NetBSD: consinit.c,v 1.9 2000/10/20 05:32:35 mrg Exp $ */
/*-
@@ -93,7 +93,7 @@ prom_cnprobe(struct consdev *cd)
if (cdevsw[maj].d_open == pconsopen)
break;
cd->cn_dev = makedev(maj, 0);
- cd->cn_pri = CN_INTERNAL;
+ cd->cn_pri = CN_MIDPRI;
#endif
}
diff --git a/sys/arch/vax/qbus/qd.c b/sys/arch/vax/qbus/qd.c
index a23f23aa80b..7a646038d1a 100644
--- a/sys/arch/vax/qbus/qd.c
+++ b/sys/arch/vax/qbus/qd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: qd.c,v 1.12 2007/04/10 17:47:55 miod Exp $ */
+/* $OpenBSD: qd.c,v 1.13 2008/01/23 16:37:57 jsing Exp $ */
/* $NetBSD: qd.c,v 1.17 2000/01/24 02:40:29 matt Exp $ */
/*-
@@ -439,7 +439,7 @@ qdcnprobe(cndev)
for (i = 0; i < nchrdev; i++)
if (cdevsw[i].d_open == qdopen) {
cndev->cn_dev = makedev(i,0);
- cndev->cn_pri = CN_INTERNAL;
+ cndev->cn_pri = CN_MIDPRI;
return;
}
return;
diff --git a/sys/arch/vax/vax/gencons.c b/sys/arch/vax/vax/gencons.c
index 905325328b9..5158f4205ea 100644
--- a/sys/arch/vax/vax/gencons.c
+++ b/sys/arch/vax/vax/gencons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gencons.c,v 1.17 2006/07/19 20:21:08 miod Exp $ */
+/* $OpenBSD: gencons.c,v 1.18 2008/01/23 16:37:57 jsing Exp $ */
/* $NetBSD: gencons.c,v 1.22 2000/01/24 02:40:33 matt Exp $ */
/*
@@ -260,7 +260,7 @@ gencnprobe(struct consdev *cndev)
(vax_boardtype == VAX_BTYP_1301) ||
(vax_boardtype == VAX_BTYP_1305)) {
cndev->cn_dev = makedev(25, 0);
- cndev->cn_pri = CN_NORMAL;
+ cndev->cn_pri = CN_LOWPRI;
}
}
diff --git a/sys/arch/vax/vax/wscons_machdep.c b/sys/arch/vax/vax/wscons_machdep.c
index f3771673de9..fd626539e67 100644
--- a/sys/arch/vax/vax/wscons_machdep.c
+++ b/sys/arch/vax/vax/wscons_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_machdep.c,v 1.3 2007/12/28 20:44:37 miod Exp $ */
+/* $OpenBSD: wscons_machdep.c,v 1.4 2008/01/23 16:37:57 jsing Exp $ */
/*
* Copyright (c) 2006 Miodrag Vallat.
*
@@ -109,7 +109,7 @@ wscnprobe(struct consdev *cp)
return;
found:
- cp->cn_pri = CN_INTERNAL;
+ cp->cn_pri = CN_MIDPRI;
cp->cn_dev = makedev(major, 0);
}
diff --git a/sys/arch/vax/vsa/dz_ibus.c b/sys/arch/vax/vsa/dz_ibus.c
index 1905f02ac62..5e8cdbdc28e 100644
--- a/sys/arch/vax/vsa/dz_ibus.c
+++ b/sys/arch/vax/vsa/dz_ibus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dz_ibus.c,v 1.23 2007/12/28 20:42:31 miod Exp $ */
+/* $OpenBSD: dz_ibus.c,v 1.24 2008/01/23 16:37:57 jsing Exp $ */
/* $NetBSD: dz_ibus.c,v 1.15 1999/08/27 17:50:42 ragge Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
@@ -313,7 +313,7 @@ dzcnprobe(cndev)
default:
return;
}
- cndev->cn_pri = diagcons != 0 ? CN_REMOTE : CN_NORMAL;
+ cndev->cn_pri = diagcons != 0 ? CN_HIGHPRI : CN_LOWPRI;
cndev->cn_dev = makedev(major, dz_can_have_kbd() ? 3 : diagcons);
dz_regs = iospace;
dz = (void *)dz_regs;
diff --git a/sys/arch/vax/vxt/qsc.c b/sys/arch/vax/vxt/qsc.c
index ce8a1e65bfd..c69b4b950be 100644
--- a/sys/arch/vax/vxt/qsc.c
+++ b/sys/arch/vax/vxt/qsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: qsc.c,v 1.1 2006/08/27 16:55:41 miod Exp $ */
+/* $OpenBSD: qsc.c,v 1.2 2008/01/23 16:37:57 jsing Exp $ */
/*
* Copyright (c) 2006 Miodrag Vallat.
*
@@ -829,7 +829,7 @@ qsccnprobe(struct consdev *cp)
ioaccess(iospace, QSCADDR, 1);
cp->cn_dev = makedev(maj, QSC_LINE_SERIAL);
- cp->cn_pri = vax_confdata & 2 ? CN_NORMAL : CN_REMOTE;
+ cp->cn_pri = vax_confdata & 2 ? CN_LOWPRI : CN_HIGHPRI;
}
void
diff --git a/sys/arch/zaurus/stand/zboot/unixcons.c b/sys/arch/zaurus/stand/zboot/unixcons.c
index 6c34b5c8fe9..c6502ac41f8 100644
--- a/sys/arch/zaurus/stand/zboot/unixcons.c
+++ b/sys/arch/zaurus/stand/zboot/unixcons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: unixcons.c,v 1.1 2005/05/24 20:38:20 uwe Exp $ */
+/* $OpenBSD: unixcons.c,v 1.2 2008/01/23 16:37:57 jsing Exp $ */
/*
* Copyright (c) 1997-1999 Michael Shalayeff
@@ -103,7 +103,7 @@ common_getc(dev_t dev)
void
cn_probe(struct consdev *cn)
{
- cn->cn_pri = CN_INTERNAL;
+ cn->cn_pri = CN_MIDPRI;
cn->cn_dev = makedev(0,0);
printf("cn%d ", minor(cn->cn_dev));
}
@@ -146,7 +146,7 @@ com_probe(struct consdev *cn)
printf("com%d ", i);
}
- cn->cn_pri = CN_NORMAL;
+ cn->cn_pri = CN_LOWPRI;
/* XXX from arm/conf.c */
cn->cn_dev = makedev(12, 0);
}
diff --git a/sys/dev/cninit.c b/sys/dev/cninit.c
index 1b4580d3baa..c4210eb56c5 100644
--- a/sys/dev/cninit.c
+++ b/sys/dev/cninit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cninit.c,v 1.7 2007/09/10 17:29:00 miod Exp $ */
+/* $OpenBSD: cninit.c,v 1.8 2008/01/23 16:37:55 jsing Exp $ */
/* $NetBSD: cninit.c,v 1.2 1995/04/11 22:08:10 pk Exp $ */
/*
@@ -59,21 +59,23 @@ cninit()
/*
* Collect information about all possible consoles
- * and find the one with highest priority
+ * and find the one with highest priority.
*/
for (cp = constab; cp->cn_probe; cp++) {
(*cp->cn_probe)(cp);
- if (cp->cn_pri > CN_DEAD &&
+ if (cp->cn_pri != CN_DEAD &&
(cn_tab == NULL || cp->cn_pri > cn_tab->cn_pri))
cn_tab = cp;
}
+
/*
- * No console, we can handle it
+ * No console, we can handle it.
*/
if ((cp = cn_tab) == NULL)
return;
+
/*
- * Turn on console
+ * Turn on console.
*/
(*cp->cn_init)(cp);
}
@@ -89,10 +91,10 @@ cnset(dev)
*/
for (cp = constab; cp->cn_probe; cp++) {
if (major(cp->cn_dev) == major(dev)) {
- /* short-circuit noop */
+ /* Short-circuit noop. */
if (cp == cn_tab && cp->cn_dev == dev)
return (0);
- if (cp->cn_pri > CN_DEAD) {
+ if (cp->cn_pri != CN_DEAD) {
cn_tab = cp;
cp->cn_dev = dev;
/* Turn it on. */
diff --git a/sys/dev/cons.h b/sys/dev/cons.h
index cc729e6c2da..1467897403e 100644
--- a/sys/dev/cons.h
+++ b/sys/dev/cons.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cons.h,v 1.15 2006/01/01 11:59:40 miod Exp $ */
+/* $OpenBSD: cons.h,v 1.16 2008/01/23 16:37:55 jsing Exp $ */
/* $NetBSD: cons.h,v 1.14 1996/03/14 19:08:35 christos Exp $ */
/*
@@ -53,15 +53,15 @@ struct consdev {
/* ring bell */
void (*cn_bell)(dev_t, u_int, u_int, u_int);
dev_t cn_dev; /* major/minor of device */
- int cn_pri; /* picking order; the higher the better */
+ u_int cn_pri; /* picking order; the higher the better */
};
-/* values for cn_pri - reflect our policy for console selection */
-#define CN_DEAD 0 /* device doesn't exist */
-#define CN_NORMAL 1 /* device exists but is nothing special */
-#define CN_INTERNAL 2 /* "internal" bit-mapped display */
-#define CN_REMOTE 3 /* serial interface with remote bit set */
-#define CN_FORCED 4
+/* Values for cn_pri - policy for console selection. */
+#define CN_DEAD 0 /* Device does not exist. */
+#define CN_LOWPRI 1 /* Device exists and is low priority. */
+#define CN_MIDPRI 2 /* Device exists and is medium priority. */
+#define CN_HIGHPRI 3 /* Device exists and is high priority. */
+#define CN_FORCED 4 /* Use this device. */
/* XXX */
#define CONSMAJOR 0
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 634ab9401ce..2ed5b36e0fe 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com.c,v 1.120 2008/01/12 13:32:23 miod Exp $ */
+/* $OpenBSD: com.c,v 1.121 2008/01/23 16:37:55 jsing Exp $ */
/* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */
/*
@@ -1354,9 +1354,9 @@ comcnprobe(struct consdev *cp)
/* initialize required fields */
cp->cn_dev = makedev(commajor, CONUNIT);
#if defined(COMCONSOLE) || defined(PCCOMCONSOLE) || !defined(__amd64__)
- cp->cn_pri = CN_REMOTE;
+ cp->cn_pri = CN_HIGHPRI;
#else
- cp->cn_pri = CN_NORMAL;
+ cp->cn_pri = CN_LOWPRI;
#endif
}
@@ -1381,7 +1381,7 @@ comcnattach(bus_space_tag_t iot, bus_addr_t iobase, int rate, int frequency, tcf
{
static struct consdev comcons = {
NULL, NULL, comcngetc, comcnputc, comcnpollc, NULL,
- NODEV, CN_NORMAL
+ NODEV, CN_LOWPRI
};
#ifndef __sparc64__
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index e89b5249496..f2f0f9ebca8 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.84 2007/11/26 16:56:41 miod Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.85 2008/01/23 16:37:55 jsing Exp $ */
/* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */
/*
@@ -250,7 +250,7 @@ void (*wsdisplay_cons_kbd_pollc)(dev_t, int);
struct consdev wsdisplay_cons = {
NULL, NULL, wsdisplay_getc_dummy, wsdisplay_cnputc,
- wsdisplay_pollc, NULL, NODEV, CN_NORMAL
+ wsdisplay_pollc, NULL, NODEV, CN_LOWPRI
};
#ifndef WSDISPLAY_DEFAULTSCREENS
diff --git a/sys/lib/libsa/cons.c b/sys/lib/libsa/cons.c
index d5869f4edc3..92464c10ea9 100644
--- a/sys/lib/libsa/cons.c
+++ b/sys/lib/libsa/cons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cons.c,v 1.12 2007/09/10 17:29:02 miod Exp $ */
+/* $OpenBSD: cons.c,v 1.13 2008/01/23 16:37:55 jsing Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -55,7 +55,7 @@ cninit(void)
*/
for (cp = constab; cp->cn_probe; cp++) {
(*cp->cn_probe)(cp);
- if (cp->cn_pri > CN_DEAD &&
+ if (cp->cn_pri != CN_DEAD &&
(cn_tab == NULL || cp->cn_pri > cn_tab->cn_pri))
cn_tab = cp;
}
@@ -83,7 +83,7 @@ cnset(dev_t dev)
/* short-circuit noop */
if (cp == cn_tab && cp->cn_dev == dev)
return (0);
- if (cp->cn_pri > CN_DEAD) {
+ if (cp->cn_pri != CN_DEAD) {
cn_tab = cp;
cp->cn_dev = dev;
/* Turn it on. */
diff --git a/sys/lib/libsa/unixdev.c b/sys/lib/libsa/unixdev.c
index f3d63b3e73f..bdfd06d9ca6 100644
--- a/sys/lib/libsa/unixdev.c
+++ b/sys/lib/libsa/unixdev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: unixdev.c,v 1.7 2003/08/11 06:23:09 deraadt Exp $ */
+/* $OpenBSD: unixdev.c,v 1.8 2008/01/23 16:37:56 jsing Exp $ */
/*
* Copyright (c) 1996-1998 Michael Shalayeff
@@ -115,7 +115,7 @@ ulseek(int fd, off_t off, int wh)
void
unix_probe(struct consdev *cn)
{
- cn->cn_pri = CN_INTERNAL;
+ cn->cn_pri = CN_MIDPRI;
cn->cn_dev = makedev(0,0);
printf("ux%d ", minor(cn->cn_dev));
}