[src/trunk]: src/sys/dev/wscons Always include declarations/definitions for N...

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

details:   https://anonhg.NetBSD.org/src/rev/ab38ff378d2c
branches:  trunk
changeset: 824632:ab38ff378d2c
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Mon Jun 12 07:10:07 2017 +0000

description:
Always include declarations/definitions for NWSMUX and NWSDISPLAY even
if they aren't needed.  This enables us to have structures of a fixed
size regardless of which child devices are configured, which enables
better modularization.

diffstat:

 sys/dev/wscons/wsmuxvar.h |  9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diffs (37 lines):

diff -r 5cdcd4d1e367 -r ab38ff378d2c sys/dev/wscons/wsmuxvar.h
--- a/sys/dev/wscons/wsmuxvar.h Mon Jun 12 07:06:45 2017 +0000
+++ b/sys/dev/wscons/wsmuxvar.h Mon Jun 12 07:10:07 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wsmuxvar.h,v 1.16 2017/06/11 03:55:56 nat Exp $        */
+/*     $NetBSD: wsmuxvar.h,v 1.17 2017/06/12 07:10:07 pgoyette Exp $   */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,13 +37,9 @@
        const struct wssrcops *me_ops;  /* method pointers */
        struct wseventvar me_evar;      /* wseventvar opened directly */
        struct wseventvar *me_evp;      /* our wseventvar when open */
-#if NWSDISPLAY > 0
        device_t me_dispdv;       /* our display if part of one */
-#endif
-#if NWSMUX > 0
        struct wsmux_softc *me_parent;  /* parent mux device */
        TAILQ_ENTRY(wsevsrc) me_next;   /* sibling pointers */
-#endif
 };
 
 /*
@@ -70,7 +66,6 @@
 #define wsevsrc_set_display(me, arg) \
        ((me)->me_ops->dsetdisplay((me)->me_dv, arg))
 
-#if NWSMUX > 0
 struct wsmux_softc {
        struct wsevsrc sc_base;
        struct proc *sc_p;              /* open proc */
@@ -90,5 +85,3 @@
 int    wskbd_add_mux(int, struct wsmux_softc *);
 int    wsmouse_add_mux(int, struct wsmux_softc *);
 int    wsbell_add_mux(int, struct wsmux_softc *);
-
-#endif /* NWSMUX > 0 */