diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2001-03-14 06:18:49 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2001-03-14 06:18:49 +0000 |
| commit | 4f84f4d31232004b002699c4918bd5dfede599f9 (patch) | |
| tree | 033052dcd01a42c249152f22e612d44356a67679 /sys/arch/i386 | |
| parent | 9ad1dacc2086f200c905ea3ae404b97a1cc64576 (diff) | |
Back out order change in conf.c and priority change in wscons_machdep.c
Add kludge to prevent wscons on i386 from stealing the console from
another source. wscons should really be fixed to not touch cn_tab...
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 8 | ||||
| -rw-r--r-- | sys/arch/i386/i386/wscons_machdep.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 4b39a127b2c..e2b626f5717 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.66 2001/03/05 22:16:42 millert Exp $ */ +/* $OpenBSD: conf.c,v 1.67 2001/03/14 06:18:47 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 00f5626603e..21a9a141e0c 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.3 2001/03/05 22:16:42 millert Exp $ */ +/* $OpenBSD: wscons_machdep.c,v 1.4 2001/03/14 06:18:47 millert Exp $ */ /* * Copyright (c) 2001 Aaron Campbell @@ -105,7 +105,7 @@ wscnprobe(cp) } cp->cn_dev = makedev(maj, 0); - cp->cn_pri = CN_NORMAL; + cp->cn_pri = CN_INTERNAL; } void |