 @@ -1,14 +1,14 @@
-/* $NetBSD: wsemul_dumb.c,v 1.16 2017/05/19 19:22:33 macallan Exp $ */
+/* $NetBSD: wsemul_dumb.c,v 1.17 2017/11/03 18:42:35 maya Exp $ */
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -21,60 +21,60 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_dumb.c,v 1.16 2017/05/19 19:22:33 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_dumb.c,v 1.17 2017/11/03 18:42:35 maya Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/malloc.h>
 #include <sys/fcntl.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsemulvar.h>
 #include <dev/wscons/ascii.h>
 #include <dev/wscons/wsksymdef.h>
 void	*wsemul_dumb_cnattach(const struct wsscreen_descr *, void *,
 				   int, int, long);
 void	*wsemul_dumb_attach(int console, const struct wsscreen_descr *,
 				 void *, int, int, void *, long);
 void	wsemul_dumb_output(void *cookie, const u_char *data, u_int count, int);
 int	wsemul_dumb_translate(void *cookie, keysym_t, const char **);
 void	wsemul_dumb_detach(void *cookie, u_int *crowp, u_int *ccolp);
 void	wsemul_dumb_resetop(void *, enum wsemul_resetops);
 const struct wsemul_ops wsemul_dumb_ops = {
-	"dumb",
+	.name = "dumb",
-	wsemul_dumb_cnattach,
+	.cnattach = wsemul_dumb_cnattach,
-	wsemul_dumb_attach,
+	.attach = wsemul_dumb_attach,
-	wsemul_dumb_output,
+	.output = wsemul_dumb_output,
-	wsemul_dumb_translate,
+	.translate = wsemul_dumb_translate,
-	wsemul_dumb_detach,
+	.detach = wsemul_dumb_detach,
-	wsemul_dumb_resetop,
+	.reset = wsemul_dumb_resetop,
-	NULL,	/* getmsgattrs */
+	.getmsgattrs = NULL,
-	NULL,	/* setmsgattrs */
+	.setmsgattrs = NULL,
-	NULL	/* resize */
+	.resize = NULL,
 };
 struct wsemul_dumb_emuldata {
 	const struct wsdisplay_emulops *emulops;
 	void *emulcookie;
 	void *cbcookie;
 	u_int nrows, ncols, crow, ccol;
 	long defattr;
 };
 struct wsemul_dumb_emuldata wsemul_dumb_console_emuldata;
 void *

 @@ -1,14 +1,14 @@
-/* $NetBSD: wsemul_sun.c,v 1.31 2017/11/03 17:57:58 maya Exp $ */
+/* $NetBSD: wsemul_sun.c,v 1.32 2017/11/03 18:42:35 maya Exp $ */
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -23,61 +23,61 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /* XXX DESCRIPTION/SOURCE OF INFORMATION */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_sun.c,v 1.31 2017/11/03 17:57:58 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_sun.c,v 1.32 2017/11/03 18:42:35 maya Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/malloc.h>
 #include <sys/fcntl.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsemulvar.h>
 #include <dev/wscons/wsksymdef.h>
 #include <dev/wscons/ascii.h>
 void	*wsemul_sun_cnattach(const struct wsscreen_descr *, void *,
 				  int, int, long);
 void	*wsemul_sun_attach(int console, const struct wsscreen_descr *,
 				void *, int, int, void *, long);
 void	wsemul_sun_output(void *cookie, const u_char *data, u_int count,
 			       int);
 int	wsemul_sun_translate(void *cookie, keysym_t, const char **);
 void	wsemul_sun_detach(void *cookie, u_int *crowp, u_int *ccolp);
 void	wsemul_sun_resetop(void *, enum wsemul_resetops);
 const struct wsemul_ops wsemul_sun_ops = {
-	"sun",
+	.name = "sun",
-	wsemul_sun_cnattach,
+	.cnattach = wsemul_sun_cnattach,
-	wsemul_sun_attach,
+	.attach = wsemul_sun_attach,
-	wsemul_sun_output,
+	.output = wsemul_sun_output,
-	wsemul_sun_translate,
+	.translate = wsemul_sun_translate,
-	wsemul_sun_detach,
+	.detach = wsemul_sun_detach,
-	wsemul_sun_resetop,
+	.reset = wsemul_sun_resetop,
-	NULL,	/* getmsgattrs */
+	.getmsgattrs = NULL,
-	NULL,	/* setmsgattrs */
+	.setmsgattrs = NULL,
-	NULL	/* resize */
+	.resize = NULL,
 };
 #define	SUN_EMUL_STATE_NORMAL	0	/* normal processing */
 #define	SUN_EMUL_STATE_HAVEESC	1	/* seen start of ctl seq */
 #define	SUN_EMUL_STATE_CONTROL	2	/* processing ctl seq */
 #define	SUN_EMUL_NARGS	2		/* max # of args to a command */
 struct wsemul_sun_emuldata {
 	const struct wsdisplay_emulops *emulops;
 	void *emulcookie;
 	void *cbcookie;
 	int scrcapabilities;

 @@ -1,14 +1,14 @@
-/* $NetBSD: wsemul_vt100.c,v 1.39 2017/11/03 17:57:58 maya Exp $ */
+/* $NetBSD: wsemul_vt100.c,v 1.40 2017/11/03 18:42:35 maya Exp $ */
 /*
  * Copyright (c) 1998
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.39 2017/11/03 17:57:58 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.40 2017/11/03 18:42:35 maya Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_wsmsgattrs.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/malloc.h>
 #include <sys/fcntl.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 @@ -50,39 +50,39 @@ void	*wsemul_vt100_cnattach(const struct
 void	*wsemul_vt100_attach(int console, const struct wsscreen_descr *,
 			     void *, int, int, void *, long);
 void	wsemul_vt100_output(void *cookie, const u_char *data, u_int count, int);
 void	wsemul_vt100_detach(void *cookie, u_int *crowp, u_int *ccolp);
 void	wsemul_vt100_resetop(void *, enum wsemul_resetops);
 #ifdef WSDISPLAY_CUSTOM_OUTPUT
 static void wsemul_vt100_getmsgattrs(void *, struct wsdisplay_msgattrs *);
 static void wsemul_vt100_setmsgattrs(void *, const struct wsscreen_descr *,
                                      const struct wsdisplay_msgattrs *);
 #endif /* WSDISPLAY_CUSTOM_OUTPUT */
 static void wsemul_vt100_resize(void *, const struct wsscreen_descr *);
 const struct wsemul_ops wsemul_vt100_ops = {
-	"vt100",
+	.name = "vt100",
-	wsemul_vt100_cnattach,
+	.cnattach = wsemul_vt100_cnattach,
-	wsemul_vt100_attach,
+	.attach = wsemul_vt100_attach,
-	wsemul_vt100_output,
+	.output = wsemul_vt100_output,
-	wsemul_vt100_translate,
+	.translate = wsemul_vt100_translate,
-	wsemul_vt100_detach,
+	.detach = wsemul_vt100_detach,
-	wsemul_vt100_resetop,
+	.reset = wsemul_vt100_resetop,
 #ifdef WSDISPLAY_CUSTOM_OUTPUT
-	wsemul_vt100_getmsgattrs,
+	.getmsgattrs = wsemul_vt100_getmsgattrs,
-	wsemul_vt100_setmsgattrs,
+	.setmsgattrs = wsemul_vt100_setmsgattrs,
 #else
-	NULL,
+	.getmsgattrs = NULL,
-	NULL,
+	.setmsgattrs = NULL,
 #endif
 	.resize = wsemul_vt100_resize
 };
 struct wsemul_vt100_emuldata wsemul_vt100_console_emuldata;
 static void wsemul_vt100_init(struct wsemul_vt100_emuldata *,
 			      const struct wsscreen_descr *,
 			      void *, int, int, long);
 static void wsemul_vt100_output_normal(struct wsemul_vt100_emuldata *,
 				       u_char, int);
 static void wsemul_vt100_output_c0c1(struct wsemul_vt100_emuldata *,