summaryrefslogtreecommitdiff
path: root/sys/lib
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2008-01-23 16:37:59 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2008-01-23 16:37:59 +0000
commit7f1108670a2ba0bd92c2a3691e98bc89725e6589 (patch)
treeb334068e0263bb1f8a52cc8ec13e75efc2b74092 /sys/lib
parentc55bd1fde22d7d1558a234e1b9f927f4f88e19ff (diff)
Cleanup cn_pri. Change constants to more meaningful names, rather than
the hp300 related ones currently in use. CN_NORMAL becomes CN_LOWPRI, CN_INTERNAL becomes CN_MIDPRI and CN_REMOTE becomes CN_HIGHPRI. ok miod@
Diffstat (limited to 'sys/lib')
-rw-r--r--sys/lib/libsa/cons.c6
-rw-r--r--sys/lib/libsa/unixdev.c4
2 files changed, 5 insertions, 5 deletions
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));
}