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@

5 files changed, 15 insertions, 15 deletions

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;
 		}
 	}