Mon Jun 12 07:10:07 2017 UTC ()
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.


(pgoyette)
diff -r1.16 -r1.17 src/sys/dev/wscons/wsmuxvar.h
cvs diff -r1.16 -r1.17 src/sys/dev/wscons/wsmuxvar.h (expand / switch to unified diff)

--- src/sys/dev/wscons/wsmuxvar.h 2017/06/11 03:55:56 1.16
+++ src/sys/dev/wscons/wsmuxvar.h 2017/06/12 07:10:07 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: wsmuxvar.h,v 1.16 2017/06/11 03:55:56 nat Exp $ */ 1/* $NetBSD: wsmuxvar.h,v 1.17 2017/06/12 07:10:07 pgoyette Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1998 The NetBSD Foundation, Inc. 4 * Copyright (c) 1998 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Author: Lennart Augustsson <augustss@carlstedt.se> 7 * Author: Lennart Augustsson <augustss@carlstedt.se>
8 * Carlstedt Research & Technology 8 * Carlstedt Research & Technology
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -27,68 +27,61 @@ @@ -27,68 +27,61 @@
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32/* 32/*
33 * A ws event source, i.e., wskbd, wsmouse, or wsmux. 33 * A ws event source, i.e., wskbd, wsmouse, or wsmux.
34 */ 34 */
35struct wsevsrc { 35struct wsevsrc {
36 device_t me_dv; 36 device_t me_dv;
37 const struct wssrcops *me_ops; /* method pointers */ 37 const struct wssrcops *me_ops; /* method pointers */
38 struct wseventvar me_evar; /* wseventvar opened directly */ 38 struct wseventvar me_evar; /* wseventvar opened directly */
39 struct wseventvar *me_evp; /* our wseventvar when open */ 39 struct wseventvar *me_evp; /* our wseventvar when open */
40#if NWSDISPLAY > 0 
41 device_t me_dispdv; /* our display if part of one */ 40 device_t me_dispdv; /* our display if part of one */
42#endif 
43#if NWSMUX > 0 
44 struct wsmux_softc *me_parent; /* parent mux device */ 41 struct wsmux_softc *me_parent; /* parent mux device */
45 TAILQ_ENTRY(wsevsrc) me_next; /* sibling pointers */ 42 TAILQ_ENTRY(wsevsrc) me_next; /* sibling pointers */
46#endif 
47}; 43};
48 44
49/* 45/*
50 * Methods that can be performed on an events source. Usually called 46 * Methods that can be performed on an events source. Usually called
51 * from a wsmux. 47 * from a wsmux.
52 */ 48 */
53struct wssrcops { 49struct wssrcops {
54 int type; /* device type: WSMUX_{MOUSE,KBD,MUX} */ 50 int type; /* device type: WSMUX_{MOUSE,KBD,MUX} */
55 int (*dopen)(struct wsevsrc *, struct wseventvar *); 51 int (*dopen)(struct wsevsrc *, struct wseventvar *);
56 int (*dclose)(struct wsevsrc *); 52 int (*dclose)(struct wsevsrc *);
57 int (*dioctl)(device_t, u_long, void *, int, struct lwp *); 53 int (*dioctl)(device_t, u_long, void *, int, struct lwp *);
58 int (*ddispioctl)(device_t, u_long, void *, int, struct lwp *); 54 int (*ddispioctl)(device_t, u_long, void *, int, struct lwp *);
59 int (*dsetdisplay)(device_t, struct wsevsrc *); 55 int (*dsetdisplay)(device_t, struct wsevsrc *);
60}; 56};
61 57
62#define wsevsrc_open(me, evp) \ 58#define wsevsrc_open(me, evp) \
63 ((me)->me_ops->dopen((me), evp)) 59 ((me)->me_ops->dopen((me), evp))
64#define wsevsrc_close(me) \ 60#define wsevsrc_close(me) \
65 ((me)->me_ops->dclose((me))) 61 ((me)->me_ops->dclose((me)))
66#define wsevsrc_ioctl(me, cmd, data, flag, l) \ 62#define wsevsrc_ioctl(me, cmd, data, flag, l) \
67 ((me)->me_ops->dioctl((me)->me_dv, cmd, (void *)data, flag, l)) 63 ((me)->me_ops->dioctl((me)->me_dv, cmd, (void *)data, flag, l))
68#define wsevsrc_display_ioctl(me, cmd, data, flag, l) \ 64#define wsevsrc_display_ioctl(me, cmd, data, flag, l) \
69 ((me)->me_ops->ddispioctl((me)->me_dv, cmd, (void *)data, flag, l)) 65 ((me)->me_ops->ddispioctl((me)->me_dv, cmd, (void *)data, flag, l))
70#define wsevsrc_set_display(me, arg) \ 66#define wsevsrc_set_display(me, arg) \
71 ((me)->me_ops->dsetdisplay((me)->me_dv, arg)) 67 ((me)->me_ops->dsetdisplay((me)->me_dv, arg))
72 68
73#if NWSMUX > 0 
74struct wsmux_softc { 69struct wsmux_softc {
75 struct wsevsrc sc_base; 70 struct wsevsrc sc_base;
76 struct proc *sc_p; /* open proc */ 71 struct proc *sc_p; /* open proc */
77 TAILQ_HEAD(, wsevsrc) sc_cld; /* list of children */ 72 TAILQ_HEAD(, wsevsrc) sc_cld; /* list of children */
78 u_int32_t sc_kbd_layout; /* current layout of keyboard */ 73 u_int32_t sc_kbd_layout; /* current layout of keyboard */
79#ifdef WSDISPLAY_COMPAT_RAWKBD 74#ifdef WSDISPLAY_COMPAT_RAWKBD
80 int sc_rawkbd; /* A hack to remember the kbd mode */ 75 int sc_rawkbd; /* A hack to remember the kbd mode */
81#endif 76#endif
82}; 77};
83 78
84struct wsmux_softc *wsmux_getmux(int); 79struct wsmux_softc *wsmux_getmux(int);
85struct wsmux_softc *wsmux_create(const char *, int); 80struct wsmux_softc *wsmux_create(const char *, int);
86int wsmux_attach_sc(struct wsmux_softc *, struct wsevsrc *); 81int wsmux_attach_sc(struct wsmux_softc *, struct wsevsrc *);
87void wsmux_detach_sc(struct wsevsrc *); 82void wsmux_detach_sc(struct wsevsrc *);
88int wsmux_set_display(struct wsmux_softc *, device_t); 83int wsmux_set_display(struct wsmux_softc *, device_t);
89 84
90int wskbd_add_mux(int, struct wsmux_softc *); 85int wskbd_add_mux(int, struct wsmux_softc *);
91int wsmouse_add_mux(int, struct wsmux_softc *); 86int wsmouse_add_mux(int, struct wsmux_softc *);
92int wsbell_add_mux(int, struct wsmux_softc *); 87int wsbell_add_mux(int, struct wsmux_softc *);
93 
94#endif /* NWSMUX > 0 */