diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2001-03-05 22:16:43 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2001-03-05 22:16:43 +0000 |
| commit | 983c19a3f252065db6d383278de2c3b46fd6c20e (patch) | |
| tree | 0fb00b0bb8d531b96de6bcd0fa0d422967b9b529 | |
| parent | 69ecdbc818e5edd59b173fff9f56a21b910997db (diff) | |
Backs out changes to wsdisplay.c so alpha (and presumably others)
is happy again. It also makes i386 serial console work by changing
the console priority in wscons_machdep.c from CN_INTERNAL to CN_NORMAL
and moves the com/pccom console attach routine for i386 to be the
first so it will be matched (consinit takes the first highest match).
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 8 | ||||
| -rw-r--r-- | sys/arch/i386/i386/wscons_machdep.c | 4 | ||||
| -rw-r--r-- | sys/dev/wscons/wsdisplay.c | 9 |
3 files changed, 10 insertions, 11 deletions
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index afc0dcc9e09..4b39a127b2c 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.65 2001/02/25 23:24:18 aaron Exp $ */ +/* $OpenBSD: conf.c,v 1.66 2001/03/05 22:16:42 millert Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -508,14 +508,14 @@ cons_decl(com); cons_decl(ws); struct consdev constab[] = { +#if NCOM + NPCCOM > 0 + cons_init(com), +#endif #if NWSDISPLAY > 0 cons_init(ws), #endif #if NPC + NVT > 0 cons_init(pc), #endif -#if NCOM + NPCCOM > 0 - cons_init(com), -#endif { 0 }, }; diff --git a/sys/arch/i386/i386/wscons_machdep.c b/sys/arch/i386/i386/wscons_machdep.c index 1ff1ad79d4c..00f5626603e 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.2 2001/02/26 20:20:02 aaron Exp $ */ +/* $OpenBSD: wscons_machdep.c,v 1.3 2001/03/05 22:16:42 millert Exp $ */ /* * Copyright (c) 2001 Aaron Campbell @@ -105,7 +105,7 @@ wscnprobe(cp) } cp->cn_dev = makedev(maj, 0); - cp->cn_pri = CN_INTERNAL; + cp->cn_pri = CN_NORMAL; } void diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c index 552c37a67c5..f6d7436928b 100644 --- a/sys/dev/wscons/wsdisplay.c +++ b/sys/dev/wscons/wsdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsdisplay.c,v 1.15 2001/03/01 20:54:33 provos Exp $ */ +/* $OpenBSD: wsdisplay.c,v 1.16 2001/03/05 22:16:41 millert Exp $ */ /* $NetBSD: wsdisplay.c,v 1.37.4.1 2000/06/30 16:27:53 simonb Exp $ */ /* @@ -524,10 +524,7 @@ wsdisplay_emul_attach(parent, self, aux) if (cdevsw[maj].d_open == wsdisplayopen) break; - if (maj == major(cn_tab->cn_dev)) { - cn_tab->cn_dev = makedev(maj, - WSDISPLAYMINOR(self->dv_unit, 0)); - } + cn_tab->cn_dev = makedev(maj, WSDISPLAYMINOR(self->dv_unit, 0)); } } @@ -681,6 +678,8 @@ wsdisplay_cnattach(type, cookie, ccol, crow, defattr) ccol, crow, defattr); + cn_tab = &wsdisplay_cons; + wsdisplay_console_initted = 1; } |