[src/trunk]: src/sys/dev/wscons Don't use wsmux_getmux() if we NWSMUX == 0. ...

[augustss <augustss%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d30888314f10
branches:  trunk
changeset: 516096:d30888314f10
user:      augustss <augustss%NetBSD.org@localhost>
date:      Mon Oct 15 21:51:33 2001 +0000

description:
Don't use wsmux_getmux() if we NWSMUX == 0.  Fixes PR kern/14252.
This is only a stop gap measure until the real wsmux changed get in.

diffstat:

 sys/dev/wscons/wsdisplay.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r 9a3b2a8d2310 -r d30888314f10 sys/dev/wscons/wsdisplay.c
--- a/sys/dev/wscons/wsdisplay.c        Mon Oct 15 21:32:25 2001 +0000
+++ b/sys/dev/wscons/wsdisplay.c        Mon Oct 15 21:51:33 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.54 2001/10/13 15:56:15 augustss Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.55 2001/10/15 21:51:33 augustss Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.54 2001/10/13 15:56:15 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.55 2001/10/15 21:51:33 augustss Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -564,10 +564,12 @@
 #if NWSKBD > 0
        struct device *dv;
 
-       if (kbdmux <= 0)
+#if NWSMUX > 0
+       if (kbdmux >= 0)
+               sc->sc_muxdv = wsmux_getmux(kbdmux);
+       else
+#endif
                sc->sc_muxdv = wsmux_create("dmux", sc->sc_dv.dv_unit);
-       else
-               sc->sc_muxdv = wsmux_getmux(kbdmux);
        /* XXX panic()ing isn't nice, but attach cannot fail */
        if (!sc->sc_muxdv)
                panic("wsdisplay_common_attach: no memory\n");