Use C99 named initializers for struct wsdisplay_accessops fields.

No functional change.

67 files changed, 346 insertions, 679 deletions

diff --git a/sys/arch/alpha/tc/cfb.c b/sys/arch/alpha/tc/cfb.c
index bb60d6002a8..16a717ccda5 100644
--- a/sys/arch/alpha/tc/cfb.c
+++ b/sys/arch/alpha/tc/cfb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cfb.c,v 1.22 2010/12/26 15:40:58 miod Exp $	*/
+/*	$OpenBSD: cfb.c,v 1.23 2013/10/20 20:07:22 miod Exp $	*/
 /*	$NetBSD: cfb.c,v 1.7 1996/12/05 01:39:39 cgd Exp $	*/
 
 /*
@@ -107,11 +107,11 @@ static int      cfb_show_screen(void *, void *, int,
 		    void (*) (void *, int, int), void *);
 
 struct wsdisplay_accessops cfb_accessops = {
-	cfbioctl,
-	cfbmmap,
-	cfb_alloc_screen,
-	cfb_free_screen,
-	cfb_show_screen,
+	.ioctl = cfbioctl,
+	.mmap = cfbmmap,
+	.alloc_screen = cfb_alloc_screen,
+	.free_screen = cfb_free_screen,
+	.show_screen = cfb_show_screen
 };
 
 int
diff --git a/sys/arch/alpha/tc/sfb.c b/sys/arch/alpha/tc/sfb.c
index 3766994c714..fb165b5607c 100644
--- a/sys/arch/alpha/tc/sfb.c
+++ b/sys/arch/alpha/tc/sfb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sfb.c,v 1.20 2010/12/26 15:40:58 miod Exp $	*/
+/*	$OpenBSD: sfb.c,v 1.21 2013/10/20 20:07:22 miod Exp $	*/
 /*	$NetBSD: sfb.c,v 1.7 1996/12/05 01:39:44 cgd Exp $	*/
 
 /*
@@ -110,11 +110,11 @@ void	sfb_unblank(struct sfb_devconfig *);
 #endif
 
 struct wsdisplay_accessops sfb_accessops = {
-        sfbioctl,
-        sfbmmap,
-        sfb_alloc_screen,
-        sfb_free_screen,
-        sfb_show_screen,
+        .ioctl = sfbioctl,
+        .mmap = sfbmmap,
+        .alloc_screen = sfb_alloc_screen,
+        .free_screen = sfb_free_screen,
+        .show_screen = sfb_show_screen
 };
 
 int
diff --git a/sys/arch/armv7/omap/omdisplay.c b/sys/arch/armv7/omap/omdisplay.c
index 4e5cea513c5..c5d777c9801 100644
--- a/sys/arch/armv7/omap/omdisplay.c
+++ b/sys/arch/armv7/omap/omdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omdisplay.c,v 1.1 2013/09/04 14:38:31 patrick Exp $ */
+/* $OpenBSD: omdisplay.c,v 1.2 2013/10/20 20:07:22 miod Exp $ */
 /*
  * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org>
  *
@@ -464,15 +464,12 @@ struct cfdriver omdisplay_cd = {
 };
 
 struct wsdisplay_accessops omdisplay_accessops = {
-	omdisplay_ioctl,
-	omdisplay_mmap,
-	omdisplay_alloc_screen,
-	omdisplay_free_screen,
-	omdisplay_show_screen,
-	NULL,	/* load font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	omdisplay_burner
+	.ioctl = omdisplay_ioctl,
+	.mmap = omdisplay_mmap,
+	.alloc_screen = omdisplay_alloc_screen,
+	.free_screen = omdisplay_free_screen,
+	.show_screen = omdisplay_show_screen,
+	.burn_screen = omdisplay_burner
 
 };
 
diff --git a/sys/arch/hp300/dev/dvbox.c b/sys/arch/hp300/dev/dvbox.c
index 1607cda0379..f4ec5c4250a 100644
--- a/sys/arch/hp300/dev/dvbox.c
+++ b/sys/arch/hp300/dev/dvbox.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dvbox.c,v 1.13 2006/08/11 18:33:13 miod Exp $	*/
+/*	$OpenBSD: dvbox.c,v 1.14 2013/10/20 20:07:22 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat
@@ -126,15 +126,12 @@ int	dvbox_ioctl(void *, u_long, caddr_t, int, struct proc *);
 void	dvbox_burner(void *, u_int, u_int);
 
 struct	wsdisplay_accessops	dvbox_accessops = {
-	dvbox_ioctl,
-	diofb_mmap,
-	diofb_alloc_screen,
-	diofb_free_screen,
-	diofb_show_screen,
-	NULL,   /* load_font */
-	NULL,   /* scrollback */
-	NULL,   /* getchar */
-	dvbox_burner
+	.ioctl = dvbox_ioctl,
+	.mmap = diofb_mmap,
+	.alloc_screen = diofb_alloc_screen,
+	.free_screen = diofb_free_screen,
+	.show_screen = diofb_show_screen,
+	.burn_screen = dvbox_burner
 };
 
 /*
diff --git a/sys/arch/hp300/dev/gbox.c b/sys/arch/hp300/dev/gbox.c
index a4d701fd5d6..8ed94cb7751 100644
--- a/sys/arch/hp300/dev/gbox.c
+++ b/sys/arch/hp300/dev/gbox.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gbox.c,v 1.15 2007/01/07 15:13:52 miod Exp $	*/
+/*	$OpenBSD: gbox.c,v 1.16 2013/10/20 20:07:22 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat
@@ -130,15 +130,12 @@ int	gbox_ioctl(void *, u_long, caddr_t, int, struct proc *);
 void	gbox_burner(void *, u_int, u_int);
 
 struct	wsdisplay_accessops	gbox_accessops = {
-	gbox_ioctl,
-	diofb_mmap,
-	diofb_alloc_screen,
-	diofb_free_screen,
-	diofb_show_screen,
-	NULL,   /* load_font */
-	NULL,   /* scrollback */
-	NULL,   /* getchar */
-	gbox_burner
+	.ioctl = gbox_ioctl,
+	.mmap = diofb_mmap,
+	.alloc_screen = diofb_alloc_screen,
+	.free_screen = diofb_free_screen,
+	.show_screen = diofb_show_screen,
+	.burn_screen = gbox_burner
 };
 
 /*
diff --git a/sys/arch/hp300/dev/hyper.c b/sys/arch/hp300/dev/hyper.c
index 06fe98c6a42..42dabf6a72a 100644
--- a/sys/arch/hp300/dev/hyper.c
+++ b/sys/arch/hp300/dev/hyper.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hyper.c,v 1.15 2006/04/14 21:05:43 miod Exp $	*/
+/*	$OpenBSD: hyper.c,v 1.16 2013/10/20 20:07:22 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat.
@@ -117,15 +117,12 @@ int	hyper_ioctl(void *, u_long, caddr_t, int, struct proc *);
 void	hyper_burner(void *, u_int, u_int);
 
 struct	wsdisplay_accessops hyper_accessops = {
-	hyper_ioctl,
-	diofb_mmap,
-	diofb_alloc_screen,
-	diofb_free_screen,
-	diofb_show_screen,
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	hyper_burner
+	.ioctl = hyper_ioctl,
+	.mmap = diofb_mmap,
+	.alloc_screen = diofb_alloc_screen,
+	.free_screen = diofb_free_screen,
+	.show_screen = diofb_show_screen,
+	.burn_screen = hyper_burner
 };
 
 /*
diff --git a/sys/arch/hp300/dev/rbox.c b/sys/arch/hp300/dev/rbox.c
index b18db52aaaf..91e7ca353a7 100644
--- a/sys/arch/hp300/dev/rbox.c
+++ b/sys/arch/hp300/dev/rbox.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbox.c,v 1.14 2006/08/11 18:33:13 miod Exp $	*/
+/*	$OpenBSD: rbox.c,v 1.15 2013/10/20 20:07:23 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat
@@ -126,15 +126,12 @@ int	rbox_ioctl(void *, u_long, caddr_t, int, struct proc *);
 void	rbox_burner(void *, u_int, u_int);
 
 struct	wsdisplay_accessops	rbox_accessops = {
-	rbox_ioctl,
-	diofb_mmap,
-	diofb_alloc_screen,
-	diofb_free_screen,
-	diofb_show_screen,
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	rbox_burner
+	.ioctl = rbox_ioctl,
+	.mmap = diofb_mmap,
+	.alloc_screen = diofb_alloc_screen,
+	.free_screen = diofb_free_screen,
+	.show_screen = diofb_show_screen,
+	.burn_screen = rbox_burner
 };
 
 /*
diff --git a/sys/arch/hp300/dev/topcat.c b/sys/arch/hp300/dev/topcat.c
index 0ce35491aea..46d7607dfee 100644
--- a/sys/arch/hp300/dev/topcat.c
+++ b/sys/arch/hp300/dev/topcat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: topcat.c,v 1.16 2013/09/28 21:10:58 miod Exp $	*/
+/*	$OpenBSD: topcat.c,v 1.17 2013/10/20 20:07:23 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat.
@@ -129,15 +129,12 @@ int	topcat_ioctl(void *, u_long, caddr_t, int, struct proc *);
 void	topcat_burner(void *, u_int, u_int);
 
 struct	wsdisplay_accessops	topcat_accessops = {
-	topcat_ioctl,
-	diofb_mmap,
-	diofb_alloc_screen,
-	diofb_free_screen,
-	diofb_show_screen,
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	topcat_burner
+	.ioctl = topcat_ioctl,
+	.mmap = diofb_mmap,
+	.alloc_screen = diofb_alloc_screen,
+	.free_screen = diofb_free_screen,
+	.show_screen = diofb_show_screen,
+	.burn_screen = topcat_burner
 };
 
 /*
diff --git a/sys/arch/hp300/dev/tvrx.c b/sys/arch/hp300/dev/tvrx.c
index 2772412a437..5403d792fd6 100644
--- a/sys/arch/hp300/dev/tvrx.c
+++ b/sys/arch/hp300/dev/tvrx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tvrx.c,v 1.2 2011/12/30 12:47:19 miod Exp $	*/
+/*	$OpenBSD: tvrx.c,v 1.3 2013/10/20 20:07:23 miod Exp $	*/
 
 /*
  * Copyright (c) 2006, 2011, Miodrag Vallat.
@@ -135,15 +135,12 @@ int	tvrx_ioctl(void *, u_long, caddr_t, int, struct proc *);
 void	tvrx_burner(void *, u_int, u_int);
 
 struct	wsdisplay_accessops	tvrx_accessops = {
-	tvrx_ioctl,
-	diofb_mmap,
-	diofb_alloc_screen,
-	diofb_free_screen,
-	diofb_show_screen,
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	tvrx_burner
+	.ioctl = tvrx_ioctl,
+	.mmap = diofb_mmap,
+	.alloc_screen = diofb_alloc_screen,
+	.free_screen = diofb_free_screen,
+	.show_screen = diofb_show_screen,
+	.burn_screen = tvrx_burner
 };
 
 /*
diff --git a/sys/arch/loongson/dev/sisfb.c b/sys/arch/loongson/dev/sisfb.c
index d693c9f0937..8935efcf7c0 100644
--- a/sys/arch/loongson/dev/sisfb.c
+++ b/sys/arch/loongson/dev/sisfb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sisfb.c,v 1.2 2010/12/26 15:40:59 miod Exp $	*/
+/*	$OpenBSD: sisfb.c,v 1.3 2013/10/20 20:07:23 miod Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -92,15 +92,11 @@ int	sisfb_show_screen(void *, void *, int, void (*)(void *, int, int),
 paddr_t	sisfb_mmap(void *, off_t, int);
 
 struct wsdisplay_accessops sisfb_accessops = {
-	sisfb_ioctl,
-	sisfb_mmap,
-	sisfb_alloc_screen,
-	sisfb_free_screen,
-	sisfb_show_screen,
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	NULL	/* burner */
+	.ioctl = sisfb_ioctl,
+	.mmap = sisfb_mmap,
+	.alloc_screen = sisfb_alloc_screen,
+	.free_screen = sisfb_free_screen,
+	.show_screen = sisfb_show_screen
 };
 
 int	sisfb_getcmap(uint8_t *, struct wsdisplay_cmap *);
diff --git a/sys/arch/loongson/dev/smfb.c b/sys/arch/loongson/dev/smfb.c
index 56494a038a7..a0c7f83e931 100644
--- a/sys/arch/loongson/dev/smfb.c
+++ b/sys/arch/loongson/dev/smfb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smfb.c,v 1.14 2012/10/03 21:44:51 miod Exp $	*/
+/*	$OpenBSD: smfb.c,v 1.15 2013/10/20 20:07:24 miod Exp $	*/
 
 /*
  * Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -117,15 +117,12 @@ paddr_t	smfb_mmap(void *, off_t, int);
 void	smfb_burner(void *, uint, uint);
 
 struct wsdisplay_accessops smfb_accessops = {
-	smfb_ioctl,
-	smfb_mmap,
-	smfb_alloc_screen,
-	smfb_free_screen,
-	smfb_show_screen,
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	smfb_burner
+	.ioctl = smfb_ioctl,
+	.mmap = smfb_mmap,
+	.alloc_screen = smfb_alloc_screen,
+	.free_screen = smfb_free_screen,
+	.show_screen = smfb_show_screen,
+	.burn_screen = smfb_burner
 };
 
 int	smfb_setup(struct smfb *, bus_space_tag_t, bus_space_handle_t,
diff --git a/sys/arch/luna88k/dev/lunafb.c b/sys/arch/luna88k/dev/lunafb.c
index 84419506c29..4d1ef2c7c91 100644
--- a/sys/arch/luna88k/dev/lunafb.c
+++ b/sys/arch/luna88k/dev/lunafb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lunafb.c,v 1.15 2013/08/16 08:47:00 aoyama Exp $ */
+/* $OpenBSD: lunafb.c,v 1.16 2013/10/20 20:07:23 miod Exp $ */
 /* $NetBSD: lunafb.c,v 1.7.6.1 2002/08/07 01:48:34 lukem Exp $ */
 
 /*-
@@ -135,15 +135,11 @@ int   omfb_show_screen(void *, void *, int,
 				void (*) (void *, int, int), void *);
 
 const struct wsdisplay_accessops omfb_accessops = {
-	omfbioctl,
-	omfbmmap,
-	omfb_alloc_screen,
-	omfb_free_screen,
-	omfb_show_screen,
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	NULL	/* burner */
+	.ioctl = omfbioctl,
+	.mmap = omfbmmap,
+	.alloc_screen = omfb_alloc_screen,
+	.free_screen = omfb_free_screen,
+	.show_screen = omfb_show_screen
 };
 
 int  omfbmatch(struct device *, void *, void *);
diff --git a/sys/arch/macppc/pci/vgafb.c b/sys/arch/macppc/pci/vgafb.c
index 1fbf2c56b47..06453a23ad8 100644
--- a/sys/arch/macppc/pci/vgafb.c
+++ b/sys/arch/macppc/pci/vgafb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgafb.c,v 1.56 2013/09/04 16:33:06 mpi Exp $	*/
+/*	$OpenBSD: vgafb.c,v 1.57 2013/10/20 20:07:23 miod Exp $	*/
 /*	$NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $	*/
 
 /*
@@ -77,15 +77,12 @@ int	vgafb_console_init(struct vgafb_softc *);
 int	vgafb_mapregs(struct vgafb_softc *, struct pci_attach_args *);
 
 struct wsdisplay_accessops vgafb_accessops = {
-	vgafb_ioctl,
-	vgafb_mmap,
-	vgafb_alloc_screen,
-	vgafb_free_screen,
-	vgafb_show_screen,
-	NULL,		/* load_font */
-	NULL,		/* scrollback */
-	NULL,		/* getchar */
-	vgafb_burn,	/* burner */
+	.ioctl = vgafb_ioctl,
+	.mmap = vgafb_mmap,
+	.alloc_screen = vgafb_alloc_screen,
+	.free_screen = vgafb_free_screen,
+	.show_screen = vgafb_show_screen,
+	.burn_screen = vgafb_burn
 };
 
 int	vgafb_getcmap(uint8_t *, struct wsdisplay_cmap *);
diff --git a/sys/arch/sgi/dev/gbe.c b/sys/arch/sgi/dev/gbe.c
index fec3fc5ed20..1ce185a10a4 100644
--- a/sys/arch/sgi/dev/gbe.c
+++ b/sys/arch/sgi/dev/gbe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gbe.c,v 1.19 2013/05/30 16:15:01 deraadt Exp $ */
+/*	$OpenBSD: gbe.c,v 1.20 2013/10/20 20:07:24 miod Exp $ */
 
 /*
  * Copyright (c) 2007, 2008, 2009 Joel Sing <jsing@openbsd.org>
@@ -151,16 +151,12 @@ struct wsscreen_descr gbe_stdscreen = {
 };
 
 struct wsdisplay_accessops gbe_accessops = {
-	gbe_ioctl,
-	gbe_mmap,
-	gbe_alloc_screen,
-	gbe_free_screen,
-	gbe_show_screen,
-	NULL,		/* load_font */
-	NULL,		/* scrollback */
-	NULL,		/* getchar */
-	gbe_burner,
-	NULL		/* pollc */
+	.ioctl = gbe_ioctl,
+	.mmap = gbe_mmap,
+	.alloc_screen = gbe_alloc_screen,
+	.free_screen = gbe_free_screen,
+	.show_screen = gbe_show_screen,
+	.burn_screen = gbe_burner
 };
 
 const struct wsscreen_descr *gbe_scrlist[] = {
diff --git a/sys/arch/sgi/dev/impact.c b/sys/arch/sgi/dev/impact.c
index 6084a52e272..748f117880a 100644
--- a/sys/arch/sgi/dev/impact.c
+++ b/sys/arch/sgi/dev/impact.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: impact.c,v 1.3 2013/06/11 18:15:55 deraadt Exp $	*/
+/*	$OpenBSD: impact.c,v 1.4 2013/10/20 20:07:24 miod Exp $	*/
 
 /*
  * Copyright (c) 2010, 2012 Miodrag Vallat.
@@ -122,16 +122,11 @@ int	impact_show_screen(void *, void *, int, void (*)(void *, int, int),
 static struct impact_screen impact_cons;
 
 struct wsdisplay_accessops impact_accessops = {
-	impact_ioctl,
-	impact_mmap,
-	impact_alloc_screen,
-	impact_free_screen,
-	impact_show_screen,
-	NULL,			/* load_font */
-	NULL,			/* scrollback */
-	NULL,			/* getchar */
-	NULL,			/* burner */
-	NULL			/* pollc */
+	.ioctl = impact_ioctl,
+	.mmap = impact_mmap,
+	.alloc_screen = impact_alloc_screen,
+	.free_screen = impact_free_screen,
+	.show_screen = impact_show_screen
 };
 
 int
diff --git a/sys/arch/sgi/gio/newport.c b/sys/arch/sgi/gio/newport.c
index d31fa91e452..74d038bf191 100644
--- a/sys/arch/sgi/gio/newport.c
+++ b/sys/arch/sgi/gio/newport.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: newport.c,v 1.6 2013/04/20 20:26:26 miod Exp $	*/
+/*	$OpenBSD: newport.c,v 1.7 2013/10/20 20:07:24 miod Exp $	*/
 /*	$NetBSD: newport.c,v 1.15 2009/05/12 23:51:25 macallan Exp $	*/
 
 /*
@@ -119,16 +119,11 @@ int	newport_show_screen(void *, void *, int, void (*)(void *, int, int),
 	    void *);
 
 struct wsdisplay_accessops newport_accessops = {
-	newport_ioctl,
-	newport_mmap,
-	newport_alloc_screen,
-	newport_free_screen,
-	newport_show_screen,
-	NULL,		/* load_font */
-	NULL,		/* scrollback */
-	NULL,		/* getchar */
-	NULL,		/* burner */
-	NULL		/* pollc */
+	.ioctl = newport_ioctl,
+	.mmap = newport_mmap,
+	.alloc_screen = newport_alloc_screen,
+	.free_screen = newport_free_screen,
+	.show_screen = newport_show_screen
 };
 
 int	newport_do_cursor(struct rasops_info *);
diff --git a/sys/arch/sgi/xbow/odyssey.c b/sys/arch/sgi/xbow/odyssey.c
index a47ac3d715b..1255f4269f0 100644
--- a/sys/arch/sgi/xbow/odyssey.c
+++ b/sys/arch/sgi/xbow/odyssey.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: odyssey.c,v 1.7 2012/04/16 22:17:16 miod Exp $ */
+/*	$OpenBSD: odyssey.c,v 1.8 2013/10/20 20:07:24 miod Exp $ */
 /*
  * Copyright (c) 2009, 2010 Joel Sing <jsing@openbsd.org>
  *
@@ -139,16 +139,12 @@ struct wsscreen_descr odyssey_stdscreen = {
 };
 
 struct wsdisplay_accessops odyssey_accessops = {
-	odyssey_ioctl,
-	odyssey_mmap,
-	odyssey_alloc_screen,
-	odyssey_free_screen,
-	odyssey_show_screen,
-	NULL,			/* load_font */
-	NULL,			/* scrollback */
-	NULL,			/* getchar */
-	odyssey_burner,
-	NULL			/* pollc */
+	.ioctl = odyssey_ioctl,
+	.mmap = odyssey_mmap,
+	.alloc_screen = odyssey_alloc_screen,
+	.free_screen = odyssey_free_screen,
+	.show_screen = odyssey_show_screen,
+	.burn_screen = odyssey_burner
 };
 
 const struct wsscreen_descr *odyssey_scrlist[] = {
diff --git a/sys/arch/sparc/dev/agten.c b/sys/arch/sparc/dev/agten.c
index 252561062c8..038cdde8863 100644
--- a/sys/arch/sparc/dev/agten.c
+++ b/sys/arch/sparc/dev/agten.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agten.c,v 1.12 2008/12/26 22:30:21 miod Exp $	*/
+/*	$OpenBSD: agten.c,v 1.13 2013/10/20 20:07:25 miod Exp $	*/
 /*
  * Copyright (c) 2002, 2003, Miodrag Vallat.
  * All rights reserved.
@@ -113,16 +113,8 @@ int	agten_putcmap(struct agten_cmap *, struct wsdisplay_cmap *);
 void	agten_loadcmap(struct agten_softc *, u_int, u_int);
 
 struct wsdisplay_accessops agten_accessops = {
-	agten_ioctl,
-	agten_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,   /* load_font */
-	NULL,   /* scrollback */
-	NULL,   /* getchar */
-	NULL,	/* burner */
-	NULL	/* pollc */
+	.ioctl = agten_ioctl,
+	.mmap = agten_mmap
 };
 
 int	agtenmatch(struct device *, void *, void *);
diff --git a/sys/arch/sparc/dev/bwtwo.c b/sys/arch/sparc/dev/bwtwo.c
index a479974d9bf..de859ce62ef 100644
--- a/sys/arch/sparc/dev/bwtwo.c
+++ b/sys/arch/sparc/dev/bwtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwtwo.c,v 1.38 2010/07/10 19:32:24 miod Exp $	*/
+/*	$OpenBSD: bwtwo.c,v 1.39 2013/10/20 20:07:25 miod Exp $	*/
 /*	$NetBSD: bwtwo.c,v 1.33 1997/05/24 20:16:02 pk Exp $ */
 
 /*
@@ -96,16 +96,9 @@ int	bwtwo_ioctl(void *, u_long, caddr_t, int, struct proc *);
 paddr_t	bwtwo_mmap(void *, off_t, int);
 
 struct wsdisplay_accessops bwtwo_accessops = {
-	bwtwo_ioctl,
-	bwtwo_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	bwtwo_burner,
-	NULL	/* pollc */
+	.ioctl = bwtwo_ioctl,
+	.mmap = bwtwo_mmap,
+	.burn_screen = bwtwo_burner
 };
 
 
diff --git a/sys/arch/sparc/dev/cgeight.c b/sys/arch/sparc/dev/cgeight.c
index 621dc6b8c0b..8cdf41d22c1 100644
--- a/sys/arch/sparc/dev/cgeight.c
+++ b/sys/arch/sparc/dev/cgeight.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgeight.c,v 1.30 2010/06/07 19:43:45 miod Exp $	*/
+/*	$OpenBSD: cgeight.c,v 1.31 2013/10/20 20:07:25 miod Exp $	*/
 /*	$NetBSD: cgeight.c,v 1.13 1997/05/24 20:16:04 pk Exp $	*/
 
 /*
@@ -92,16 +92,9 @@ paddr_t	cgeight_mmap(void *, off_t, int);
 void	cgeight_reset(struct cgeight_softc *, int);
 
 struct wsdisplay_accessops cgeight_accessops = {
-	cgeight_ioctl,
-	cgeight_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	fb_pfour_burner,
-	NULL	/* pollc */
+	.ioctl = cgeight_ioctl,
+	.mmap = cgeight_mmap,
+	.burn_screen = fb_pfour_burner
 };
 
 void	cgeightattach(struct device *, struct device *, void *);
diff --git a/sys/arch/sparc/dev/cgfour.c b/sys/arch/sparc/dev/cgfour.c
index b291eba5c02..70950430a5d 100644
--- a/sys/arch/sparc/dev/cgfour.c
+++ b/sys/arch/sparc/dev/cgfour.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgfour.c,v 1.29 2010/06/07 19:43:45 miod Exp $	*/
+/*	$OpenBSD: cgfour.c,v 1.30 2013/10/20 20:07:25 miod Exp $	*/
 /*	$NetBSD: cgfour.c,v 1.13 1997/05/24 20:16:06 pk Exp $	*/
 
 /*
@@ -91,16 +91,9 @@ paddr_t	cgfour_mmap(void *, off_t, int);
 void	cgfour_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
 
 struct wsdisplay_accessops cgfour_accessops = {
-	cgfour_ioctl,
-	cgfour_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	fb_pfour_burner,
-	NULL	/* pollc */
+	.ioctl = cgfour_ioctl,
+	.mmap = cgfour_mmap,
+	.burn_screen = fb_pfour_burner
 };
 
 void	cgfourattach(struct device *, struct device *, void *);
diff --git a/sys/arch/sparc/dev/cgfourteen.c b/sys/arch/sparc/dev/cgfourteen.c
index 78447bd825e..ad72591096a 100644
--- a/sys/arch/sparc/dev/cgfourteen.c
+++ b/sys/arch/sparc/dev/cgfourteen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgfourteen.c,v 1.37 2013/05/31 22:07:49 deraadt Exp $	*/
+/*	$OpenBSD: cgfourteen.c,v 1.38 2013/10/20 20:07:25 miod Exp $	*/
 /*	$NetBSD: cgfourteen.c,v 1.7 1997/05/24 20:16:08 pk Exp $ */
 
 /*
@@ -156,16 +156,9 @@ int	cgfourteen_putcmap(union cgfourteen_cmap *, struct wsdisplay_cmap *);
 void	cgfourteen_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
 
 struct wsdisplay_accessops cgfourteen_accessops = {
-	cgfourteen_ioctl,
-	cgfourteen_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	cgfourteen_burner,
-	NULL	/* pollc */
+	.ioctl = cgfourteen_ioctl,
+	.mmap = cgfourteen_mmap,
+	.burn_screen = cgfourteen_burner
 };
 
 void	cgfourteenattach(struct device *, struct device *, void *);
diff --git a/sys/arch/sparc/dev/cgsix.c b/sys/arch/sparc/dev/cgsix.c
index 847787ab987..7b675a1cdb4 100644
--- a/sys/arch/sparc/dev/cgsix.c
+++ b/sys/arch/sparc/dev/cgsix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgsix.c,v 1.43 2010/07/10 19:32:24 miod Exp $	*/
+/*	$OpenBSD: cgsix.c,v 1.44 2013/10/20 20:07:25 miod Exp $	*/
 /*	$NetBSD: cgsix.c,v 1.33 1997/08/07 19:12:30 pk Exp $ */
 
 /*
@@ -133,16 +133,9 @@ int	cgsix_ras_eraserows(void *, int, int, long);
 void	cgsix_ras_init(struct cgsix_softc *);
 
 struct wsdisplay_accessops cgsix_accessops = {
-	cgsix_ioctl,
-	cgsix_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	cgsix_burner,
-	NULL	/* pollc */
+	.ioctl = cgsix_ioctl,
+	.mmap = cgsix_mmap,
+	.burn_screen = cgsix_burner
 };
 
 int	cgsixmatch(struct device *, void *, void *);
diff --git a/sys/arch/sparc/dev/cgthree.c b/sys/arch/sparc/dev/cgthree.c
index 1d6c746563f..c2f363f8cca 100644
--- a/sys/arch/sparc/dev/cgthree.c
+++ b/sys/arch/sparc/dev/cgthree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgthree.c,v 1.35 2008/12/26 22:30:21 miod Exp $	*/
+/*	$OpenBSD: cgthree.c,v 1.36 2013/10/20 20:07:25 miod Exp $	*/
 /*	$NetBSD: cgthree.c,v 1.33 1997/05/24 20:16:11 pk Exp $ */
 
 /*
@@ -116,16 +116,9 @@ paddr_t	cgthree_mmap(void *, off_t, int);
 void	cgthree_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
 
 struct wsdisplay_accessops cgthree_accessops = {
-	cgthree_ioctl,
-	cgthree_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	cgthree_burner,
-	NULL	/* pollc */
+	.ioctl = cgthree_ioctl,
+	.mmap = cgthree_mmap,
+	.burn_screen = cgthree_burner
 };
 
 int	cgthreematch(struct device *, void *, void *);
diff --git a/sys/arch/sparc/dev/cgtwelve.c b/sys/arch/sparc/dev/cgtwelve.c
index 7cb63cfbb4f..dee017dfad6 100644
--- a/sys/arch/sparc/dev/cgtwelve.c
+++ b/sys/arch/sparc/dev/cgtwelve.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgtwelve.c,v 1.18 2013/05/31 22:07:49 deraadt Exp $	*/
+/*	$OpenBSD: cgtwelve.c,v 1.19 2013/10/20 20:07:25 miod Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003 Miodrag Vallat.  All rights reserved.
@@ -96,16 +96,8 @@ void	cgtwelve_ramdac_wraddr(struct cgtwelve_softc *, u_int32_t);
 void	cgtwelve_reset(struct cgtwelve_softc *, int);
 
 struct wsdisplay_accessops cgtwelve_accessops = {
-	cgtwelve_ioctl,
-	cgtwelve_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	NULL,	/* burner */
-	NULL	/* pollc */
+	.ioctl = cgtwelve_ioctl,
+	.mmap = cgtwelve_mmap
 };
 
 int	cgtwelvematch(struct device *, void *, void *);
diff --git a/sys/arch/sparc/dev/cgtwo.c b/sys/arch/sparc/dev/cgtwo.c
index 6e6c99dab09..27c96df3be9 100644
--- a/sys/arch/sparc/dev/cgtwo.c
+++ b/sys/arch/sparc/dev/cgtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgtwo.c,v 1.38 2010/06/07 19:43:45 miod Exp $	*/
+/*	$OpenBSD: cgtwo.c,v 1.39 2013/10/20 20:07:25 miod Exp $	*/
 /*	$NetBSD: cgtwo.c,v 1.22 1997/05/24 20:16:12 pk Exp $ */
 
 /*
@@ -120,16 +120,9 @@ int	cgtwo_putcmap(struct cgtwo_softc *, struct wsdisplay_cmap *);
 void	cgtwo_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
 
 struct wsdisplay_accessops cgtwo_accessops = {
-	cgtwo_ioctl,
-	cgtwo_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	cgtwo_burner,
-	NULL	/* pollc */
+	.ioctl = cgtwo_ioctl,
+	.mmap = cgtwo_mmap,
+	.burn_screen = cgtwo_burner
 };
 
 int	cgtwomatch(struct device *, void *, void *);
diff --git a/sys/arch/sparc/dev/mgx.c b/sys/arch/sparc/dev/mgx.c
index aef375330c2..588df5297ec 100644
--- a/sys/arch/sparc/dev/mgx.c
+++ b/sys/arch/sparc/dev/mgx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mgx.c,v 1.16 2009/09/05 14:09:35 miod Exp $	*/
+/*	$OpenBSD: mgx.c,v 1.17 2013/10/20 20:07:26 miod Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -131,16 +131,9 @@ int	mgx_ioctl(void *, u_long, caddr_t, int, struct proc *);
 paddr_t	mgx_mmap(void *, off_t, int);
 
 struct wsdisplay_accessops mgx_accessops = {
-	mgx_ioctl,
-	mgx_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	mgx_burner,
-	NULL	/* pollc */
+	.ioctl = mgx_ioctl,
+	.mmap = mgx_mmap,
+	.burn_screen = mgx_burner
 };
 
 int	mgx_getcmap(u_int8_t *, struct wsdisplay_cmap *);
diff --git a/sys/arch/sparc/dev/p9000.c b/sys/arch/sparc/dev/p9000.c
index d8395f0abc1..4b0350d41bd 100644
--- a/sys/arch/sparc/dev/p9000.c
+++ b/sys/arch/sparc/dev/p9000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: p9000.c,v 1.23 2009/09/05 14:09:35 miod Exp $	*/
+/*	$OpenBSD: p9000.c,v 1.24 2013/10/20 20:07:26 miod Exp $	*/
 
 /*
  * Copyright (c) 2003, Miodrag Vallat.
@@ -87,16 +87,9 @@ void	p9000_burner(void *, u_int, u_int);
 int	p9000_intr(void *);
 
 struct wsdisplay_accessops p9000_accessops = {
-	p9000_ioctl,
-	p9000_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	p9000_burner,
-	NULL	/* pollc */
+	.ioctl = p9000_ioctl,
+	.mmap = p9000_mmap,
+	.burn_screen = p9000_burner
 };
 
 int	p9000_ras_copycols(void *, int, int, int, int);
diff --git a/sys/arch/sparc/dev/p9100.c b/sys/arch/sparc/dev/p9100.c
index 7b5d7fee149..4086f9a9cca 100644
--- a/sys/arch/sparc/dev/p9100.c
+++ b/sys/arch/sparc/dev/p9100.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: p9100.c,v 1.51 2013/05/31 22:07:49 deraadt Exp $	*/
+/*	$OpenBSD: p9100.c,v 1.52 2013/10/20 20:07:26 miod Exp $	*/
 
 /*
  * Copyright (c) 2003, 2005, 2006, 2008, Miodrag Vallat.
@@ -135,16 +135,9 @@ u_int	p9100_read_ramdac(struct p9100_softc *, u_int);
 void	p9100_write_ramdac(struct p9100_softc *, u_int, u_int);
 
 struct wsdisplay_accessops p9100_accessops = {
-	p9100_ioctl,
-	p9100_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	p9100_burner,
-	NULL	/* pollc */
+	.ioctl = p9100_ioctl,
+	.mmap = p9100_mmap,
+	.burn_screen = p9100_burner
 };
 
 int	p9100_ras_copycols(void *, int, int, int, int);
diff --git a/sys/arch/sparc/dev/rfx.c b/sys/arch/sparc/dev/rfx.c
index 76fa43ef24d..0e7ac912003 100644
--- a/sys/arch/sparc/dev/rfx.c
+++ b/sys/arch/sparc/dev/rfx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rfx.c,v 1.14 2008/12/26 22:30:21 miod Exp $	*/
+/*	$OpenBSD: rfx.c,v 1.15 2013/10/20 20:07:26 miod Exp $	*/
 
 /*
  * Copyright (c) 2004, Miodrag Vallat.
@@ -126,16 +126,9 @@ int	rfx_putcmap(struct rfx_cmap *, struct wsdisplay_cmap *);
 void	rfx_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
 
 struct wsdisplay_accessops rfx_accessops = {
-	rfx_ioctl,
-	rfx_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	rfx_burner,
-	NULL	/* pollc */
+	.ioctl = rfx_ioctl,
+	.mmap = rfx_mmap,
+	.burn_screen = rfx_burner
 };
 
 int	rfxmatch(struct device *, void *, void *);
diff --git a/sys/arch/sparc/dev/tcx.c b/sys/arch/sparc/dev/tcx.c
index 6500a9c62d5..1b15b612ecb 100644
--- a/sys/arch/sparc/dev/tcx.c
+++ b/sys/arch/sparc/dev/tcx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcx.c,v 1.46 2013/05/31 22:07:49 deraadt Exp $	*/
+/*	$OpenBSD: tcx.c,v 1.47 2013/10/20 20:07:26 miod Exp $	*/
 /*	$NetBSD: tcx.c,v 1.8 1997/07/29 09:58:14 fair Exp $ */
 
 /*
@@ -125,16 +125,9 @@ void	tcx_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
 void	tcx_stipple(struct tcx_softc *, int, int, int, int, int);
 
 struct wsdisplay_accessops tcx_accessops = {
-	tcx_ioctl,
-	tcx_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,   /* load_font */
-	NULL,   /* scrollback */
-	NULL,   /* getchar */
-	tcx_burner,
-	NULL	/* pollc */
+	.ioctl = tcx_ioctl,
+	.mmap = tcx_mmap,
+	.burn_screen = tcx_burner
 };
 
 int	tcxmatch(struct device *, void *, void *);
diff --git a/sys/arch/sparc/dev/tvtwo.c b/sys/arch/sparc/dev/tvtwo.c
index f355887fe43..71d87486b66 100644
--- a/sys/arch/sparc/dev/tvtwo.c
+++ b/sys/arch/sparc/dev/tvtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tvtwo.c,v 1.17 2008/12/26 22:30:21 miod Exp $	*/
+/*	$OpenBSD: tvtwo.c,v 1.18 2013/10/20 20:07:26 miod Exp $	*/
 
 /*
  * Copyright (c) 2003, 2006, 2008, Miodrag Vallat.
@@ -125,16 +125,9 @@ paddr_t	tvtwo_mmap(void *, off_t, int);
 void	tvtwo_burner(void *, u_int, u_int);
 
 struct wsdisplay_accessops tvtwo_accessops = {
-	tvtwo_ioctl,
-	tvtwo_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	tvtwo_burner,
-	NULL	/* pollc */
+	.ioctl = tvtwo_ioctl,
+	.mmap = tvtwo_mmap,
+	.burn_screen = tvtwo_burner
 };
 
 void	tvtwo_directcmap(struct tvtwo_softc *);
diff --git a/sys/arch/sparc/dev/vigra.c b/sys/arch/sparc/dev/vigra.c
index d93fb9cc865..2f09b2f33de 100644
--- a/sys/arch/sparc/dev/vigra.c
+++ b/sys/arch/sparc/dev/vigra.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vigra.c,v 1.18 2008/12/26 22:30:21 miod Exp $	*/
+/*	$OpenBSD: vigra.c,v 1.19 2013/10/20 20:07:26 miod Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003, Miodrag Vallat.
@@ -193,16 +193,9 @@ int	vigra_putcmap(union vigracmap *, struct wsdisplay_cmap *, int);
 void	vigra_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
 
 struct wsdisplay_accessops vigra_accessops = {
-	vigra_ioctl,
-	vigra_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	vigra_burner,
-	NULL	/* pollc */
+	.ioctl = vigra_ioctl,
+	.mmap = vigra_mmap,
+	.burn_screen = vigra_burner
 };
 
 int	vigramatch(struct device *, void *, void *);
diff --git a/sys/arch/sparc/dev/zx.c b/sys/arch/sparc/dev/zx.c
index 5f109fcfa4c..8fd7c137e45 100644
--- a/sys/arch/sparc/dev/zx.c
+++ b/sys/arch/sparc/dev/zx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zx.c,v 1.25 2013/09/28 06:43:42 mlarkin Exp $	*/
+/*	$OpenBSD: zx.c,v 1.26 2013/10/20 20:07:26 miod Exp $	*/
 /*	$NetBSD: zx.c,v 1.5 2002/10/02 16:52:46 thorpej Exp $	*/
 
 /*
@@ -128,16 +128,9 @@ void	zx_reset(struct zx_softc *, u_int);
 void	zx_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
 
 struct wsdisplay_accessops zx_accessops = {
-	zx_ioctl,
-	zx_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	zx_burner,
-	NULL	/* pollc */
+	.ioctl = zx_ioctl,
+	.mmap = zx_mmap,
+	.burn_screen = zx_burner
 };
 
 /* Force 32-bit writes. */
diff --git a/sys/arch/sparc64/dev/creator.c b/sys/arch/sparc64/dev/creator.c
index 1145a741806..5cb3a946cba 100644
--- a/sys/arch/sparc64/dev/creator.c
+++ b/sys/arch/sparc64/dev/creator.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: creator.c,v 1.45 2009/12/16 11:06:17 jasper Exp $	*/
+/*	$OpenBSD: creator.c,v 1.46 2013/10/20 20:07:27 miod Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -70,15 +70,8 @@ void	creator_load_firmware(void *);
 void	creator_load_sram(struct creator_softc *, u_int32_t *, u_int32_t);
 
 struct wsdisplay_accessops creator_accessops = {
-	creator_ioctl,
-	creator_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	NULL,	/* burner */
+	.ioctl = creator_ioctl,
+	.mmap = creator_mmap
 };
 
 struct cfdriver creator_cd = {
diff --git a/sys/arch/sparc64/dev/gfb.c b/sys/arch/sparc64/dev/gfb.c
index 19f5657605e..82e2dbde808 100644
--- a/sys/arch/sparc64/dev/gfb.c
+++ b/sys/arch/sparc64/dev/gfb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gfb.c,v 1.1 2009/03/09 22:36:43 kettenis Exp $	*/
+/*	$OpenBSD: gfb.c,v 1.2 2013/10/20 20:07:27 miod Exp $	*/
 
 /*
  * Copyright (c) 2009 Mark Kettenis.
@@ -43,15 +43,7 @@ void	gfb_attach(struct device *, struct device *, void *);
 int	gfb_ioctl(void *, u_long, caddr_t, int, struct proc *);
 
 struct wsdisplay_accessops gfb_accessops = {
-	gfb_ioctl,
-	NULL,	/* mmap */
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	NULL,	/* burner */
+	.ioctl = gfb_ioctl
 };
 
 struct cfdriver gfb_cd = {
diff --git a/sys/arch/sparc64/dev/gfxp.c b/sys/arch/sparc64/dev/gfxp.c
index efb59603e63..e7bdae44f0e 100644
--- a/sys/arch/sparc64/dev/gfxp.c
+++ b/sys/arch/sparc64/dev/gfxp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gfxp.c,v 1.12 2010/11/26 21:03:36 miod Exp $	*/
+/*	$OpenBSD: gfxp.c,v 1.13 2013/10/20 20:07:27 miod Exp $	*/
 
 /*
  * Copyright (c) 2009 Mark Kettenis.
@@ -127,16 +127,8 @@ int	gfxp_ioctl(void *, u_long, caddr_t, int, struct proc *);
 paddr_t	gfxp_mmap(void *, off_t, int);
 
 struct wsdisplay_accessops gfxp_accessops = {
-	gfxp_ioctl,
-	gfxp_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	NULL,	/* burner */
-	NULL	/* pollc */
+	.ioctl = gfxp_ioctl,
+	.mmap = gfxp_mmap
 };
 
 int	gfxp_match(struct device *, void *, void *);
diff --git a/sys/arch/sparc64/dev/ifb.c b/sys/arch/sparc64/dev/ifb.c
index 16b5e44698d..029aa20965c 100644
--- a/sys/arch/sparc64/dev/ifb.c
+++ b/sys/arch/sparc64/dev/ifb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifb.c,v 1.21 2013/07/16 22:31:15 miod Exp $	*/
+/*	$OpenBSD: ifb.c,v 1.22 2013/10/20 20:07:27 miod Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008, 2009 Miodrag Vallat.
@@ -292,16 +292,9 @@ paddr_t	ifb_mmap(void *, off_t, int);
 void	ifb_burner(void *, u_int, u_int);
 
 struct wsdisplay_accessops ifb_accessops = {
-	ifb_ioctl,
-	ifb_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	ifb_burner,
-	NULL	/* pollc */
+	.ioctl = ifb_ioctl,
+	.mmap = ifb_mmap,
+	.burn_screen = ifb_burner
 };
 
 int	ifbmatch(struct device *, void *, void *);
diff --git a/sys/arch/sparc64/dev/machfb.c b/sys/arch/sparc64/dev/machfb.c
index d7dad230e44..8b8ea68121c 100644
--- a/sys/arch/sparc64/dev/machfb.c
+++ b/sys/arch/sparc64/dev/machfb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machfb.c,v 1.7 2011/02/21 07:55:27 kettenis Exp $	*/
+/*	$OpenBSD: machfb.c,v 1.8 2013/10/20 20:07:27 miod Exp $	*/
 
 /*
  * Copyright (c) 2009 Mark Kettenis.
@@ -194,16 +194,8 @@ int	machfb_ioctl(void *, u_long, caddr_t, int, struct proc *);
 paddr_t	machfb_mmap(void *, off_t, int);
 
 struct wsdisplay_accessops machfb_accessops = {
-	machfb_ioctl,
-	machfb_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	NULL,	/* burner */
-	NULL	/* pollc */
+	.ioctl = machfb_ioctl,
+	.mmap = machfb_mmap
 };
 
 int	machfb_match(struct device *, void *, void *);
diff --git a/sys/arch/sparc64/dev/pcons.c b/sys/arch/sparc64/dev/pcons.c
index c31121cf7b3..211e4b6063f 100644
--- a/sys/arch/sparc64/dev/pcons.c
+++ b/sys/arch/sparc64/dev/pcons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcons.c,v 1.19 2013/10/18 17:38:33 miod Exp $	*/
+/*	$OpenBSD: pcons.c,v 1.20 2013/10/20 20:07:27 miod Exp $	*/
 /*	$NetBSD: pcons.c,v 1.7 2001/05/02 10:32:20 scw Exp $	*/
 
 /*-
@@ -582,11 +582,11 @@ struct wsscreen_list pcons_screenlist = {
 };
 
 struct wsdisplay_accessops pcons_accessops = {
-	pcons_ioctl,
-	pcons_mmap,
-	pcons_alloc_screen,
-	pcons_free_screen,
-	pcons_show_screen
+	.ioctl = pcons_ioctl,
+	.mmap = pcons_mmap,
+	.alloc_screen = pcons_alloc_screen,
+	.free_screen = pcons_free_screen,
+	.show_screen = pcons_show_screen
 };
 
 int
diff --git a/sys/arch/sparc64/dev/radeonfb.c b/sys/arch/sparc64/dev/radeonfb.c
index 78f91aa3cb1..1f9d6d58e63 100644
--- a/sys/arch/sparc64/dev/radeonfb.c
+++ b/sys/arch/sparc64/dev/radeonfb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radeonfb.c,v 1.4 2011/02/21 07:54:47 kettenis Exp $	*/
+/*	$OpenBSD: radeonfb.c,v 1.5 2013/10/20 20:07:27 miod Exp $	*/
 
 /*
  * Copyright (c) 2009 Mark Kettenis.
@@ -121,16 +121,8 @@ int	radeonfb_ioctl(void *, u_long, caddr_t, int, struct proc *);
 paddr_t	radeonfb_mmap(void *, off_t, int);
 
 struct wsdisplay_accessops radeonfb_accessops = {
-	radeonfb_ioctl,
-	radeonfb_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	NULL,	/* burner */
-	NULL	/* pollc */
+	.ioctl = radeonfb_ioctl,
+	.mmap = radeonfb_mmap
 };
 
 int	radeonfb_match(struct device *, void *, void *);
diff --git a/sys/arch/sparc64/dev/raptor.c b/sys/arch/sparc64/dev/raptor.c
index 0d096c058b2..fe8acb4d724 100644
--- a/sys/arch/sparc64/dev/raptor.c
+++ b/sys/arch/sparc64/dev/raptor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: raptor.c,v 1.7 2010/08/07 03:50:01 krw Exp $	*/
+/*	$OpenBSD: raptor.c,v 1.8 2013/10/20 20:07:27 miod Exp $	*/
 
 /*
  * Copyright (c) 2009 Mark Kettenis.
@@ -133,16 +133,8 @@ int	raptor_ioctl(void *, u_long, caddr_t, int, struct proc *);
 paddr_t	raptor_mmap(void *, off_t, int);
 
 struct wsdisplay_accessops raptor_accessops = {
-	raptor_ioctl,
-	raptor_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	NULL,	/* burner */
-	NULL	/* pollc */
+	.ioctl = raptor_ioctl,
+	.mmap = raptor_mmap
 };
 
 int	raptor_match(struct device *, void *, void *);
diff --git a/sys/arch/sparc64/dev/vgafb.c b/sys/arch/sparc64/dev/vgafb.c
index 8f6fd70fc99..2deb2afc654 100644
--- a/sys/arch/sparc64/dev/vgafb.c
+++ b/sys/arch/sparc64/dev/vgafb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgafb.c,v 1.59 2012/07/08 16:36:23 kettenis Exp $	*/
+/*	$OpenBSD: vgafb.c,v 1.60 2013/10/20 20:07:27 miod Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -83,16 +83,8 @@ int vgafb_putcmap(struct vgafb_softc *, struct wsdisplay_cmap *);
 void vgafb_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
 
 struct wsdisplay_accessops vgafb_accessops = {
-	vgafb_ioctl,
-	vgafb_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	NULL,	/* burner */
-	NULL	/* pollc */
+	.ioctl = vgafb_ioctl,
+	.mmap = vgafb_mmap
 };
 
 int	vgafbmatch(struct device *, void *, void *);
diff --git a/sys/arch/vax/mbus/legss.c b/sys/arch/vax/mbus/legss.c
index 2d8c2d178b2..604fb73fd14 100644
--- a/sys/arch/vax/mbus/legss.c
+++ b/sys/arch/vax/mbus/legss.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: legss.c,v 1.4 2009/09/05 14:09:35 miod Exp $	*/
+/*	$OpenBSD: legss.c,v 1.5 2013/10/20 20:07:28 miod Exp $	*/
 
 /*
  * Copyright (c) 2008 Miodrag Vallat.
@@ -149,15 +149,11 @@ int	legss_show_screen(void *, void *, int,
 	    void (*) (void *, int, int), void *);
 
 const struct wsdisplay_accessops legss_accessops = {
-	legss_ioctl,
-	legss_mmap,
-	legss_alloc_screen,
-	legss_free_screen,
-	legss_show_screen,
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	NULL	/* burner */
+	.ioctl = legss_ioctl,
+	.mmap = legss_mmap,
+	.alloc_screen = legss_alloc_screen,
+	.free_screen = legss_free_screen,
+	.show_screen = legss_show_screen
 };
 
 int	legss_setup_screen(struct legss_screen *);
diff --git a/sys/arch/vax/vsa/gpx.c b/sys/arch/vax/vsa/gpx.c
index 39d5e8f94b6..20799080990 100644
--- a/sys/arch/vax/vsa/gpx.c
+++ b/sys/arch/vax/vsa/gpx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gpx.c,v 1.21 2009/09/05 14:09:35 miod Exp $	*/
+/*	$OpenBSD: gpx.c,v 1.22 2013/10/20 20:07:28 miod Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -196,15 +196,12 @@ int	gpx_show_screen(void *, void *, int,
 void	gpx_burner(void *, u_int, u_int);
 
 const struct wsdisplay_accessops gpx_accessops = {
-	gpx_ioctl,
-	gpx_mmap,
-	gpx_alloc_screen,
-	gpx_free_screen,
-	gpx_show_screen,
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	gpx_burner
+	.ioctl = gpx_ioctl,
+	.mmap = gpx_mmap,
+	.alloc_screen = gpx_alloc_screen,
+	.free_screen = gpx_free_screen,
+	.show_screen = gpx_show_screen,
+	.burn_screen = gpx_burner
 };
 
 void	gpx_clear_screen(struct gpx_screen *);
diff --git a/sys/arch/vax/vsa/lcg.c b/sys/arch/vax/vsa/lcg.c
index bf76d69e2a9..596eeb040a3 100644
--- a/sys/arch/vax/vsa/lcg.c
+++ b/sys/arch/vax/vsa/lcg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcg.c,v 1.19 2011/09/19 21:53:02 miod Exp $	*/
+/*	$OpenBSD: lcg.c,v 1.20 2013/10/20 20:07:28 miod Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -128,15 +128,12 @@ int	lcg_show_screen(void *, void *, int,
 void	lcg_burner(void *, u_int, u_int);
 
 const struct wsdisplay_accessops lcg_accessops = {
-	lcg_ioctl,
-	lcg_mmap,
-	lcg_alloc_screen,
-	lcg_free_screen,
-	lcg_show_screen,
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	lcg_burner
+	.ioctl = lcg_ioctl,
+	.mmap = lcg_mmap,
+	.alloc_screen = lcg_alloc_screen,
+	.free_screen = lcg_free_screen,
+	.show_screen = lcg_show_screen,
+	.burn_screen = lcg_burner
 };
 
 int	lcg_alloc_attr(void *, int, int, int, long *);
diff --git a/sys/arch/vax/vsa/lcspx.c b/sys/arch/vax/vsa/lcspx.c
index f659ee87048..6a39517715b 100644
--- a/sys/arch/vax/vsa/lcspx.c
+++ b/sys/arch/vax/vsa/lcspx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcspx.c,v 1.17 2011/09/20 21:11:33 miod Exp $	*/
+/*	$OpenBSD: lcspx.c,v 1.18 2013/10/20 20:07:28 miod Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -142,15 +142,11 @@ int	lcspx_show_screen(void *, void *, int,
 	    void (*) (void *, int, int), void *);
 
 const struct wsdisplay_accessops lcspx_accessops = {
-	lcspx_ioctl,
-	lcspx_mmap,
-	lcspx_alloc_screen,
-	lcspx_free_screen,
-	lcspx_show_screen,
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	NULL	/* burner */
+	.ioctl = lcspx_ioctl,
+	.mmap = lcspx_mmap,
+	.alloc_screen = lcspx_alloc_screen,
+	.free_screen = lcspx_free_screen,
+	.show_screen = lcspx_show_screen
 };
 
 int	lcspx_getcmap(struct lcspx_screen *, struct wsdisplay_cmap *);
diff --git a/sys/arch/vax/vsa/smg.c b/sys/arch/vax/vsa/smg.c
index d8cfec8c4b1..6083ee60720 100644
--- a/sys/arch/vax/vsa/smg.c
+++ b/sys/arch/vax/vsa/smg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smg.c,v 1.24 2010/12/26 15:41:00 miod Exp $	*/
+/*	$OpenBSD: smg.c,v 1.25 2013/10/20 20:07:28 miod Exp $	*/
 /*	$NetBSD: smg.c,v 1.21 2000/03/23 06:46:44 thorpej Exp $ */
 /*
  * Copyright (c) 2006, Miodrag Vallat
@@ -182,15 +182,12 @@ int	smg_show_screen(void *, void *, int,
 void	smg_burner(void *, u_int, u_int);
 
 const struct wsdisplay_accessops smg_accessops = {
-	smg_ioctl,
-	smg_mmap,
-	smg_alloc_screen,
-	smg_free_screen,
-	smg_show_screen,
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	smg_burner
+	.ioctl = smg_ioctl,
+	.mmap = smg_mmap,
+	.alloc_screen = smg_alloc_screen,
+	.free_screen = smg_free_screen,
+	.show_screen = smg_show_screen,
+	.burn_screen = smg_burner
 };
 
 void	smg_blockmove(struct rasops_info *, u_int, u_int, u_int, u_int, u_int,
diff --git a/sys/arch/zaurus/zaurus/zaurus_lcd.c b/sys/arch/zaurus/zaurus/zaurus_lcd.c
index 89fb852c5cc..3a7744728c0 100644
--- a/sys/arch/zaurus/zaurus/zaurus_lcd.c
+++ b/sys/arch/zaurus/zaurus/zaurus_lcd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zaurus_lcd.c,v 1.25 2013/05/30 16:15:01 deraadt Exp $	*/
+/*	$OpenBSD: zaurus_lcd.c,v 1.26 2013/10/20 20:07:28 miod Exp $	*/
 /* $NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp $ */
 
 /*
@@ -96,15 +96,12 @@ int	lcd_param(struct pxa2x0_lcd_softc *, u_long,
     struct wsdisplay_param *);
 
 const struct wsdisplay_accessops lcd_accessops = {
-	lcd_ioctl,
-	pxa2x0_lcd_mmap,
-	pxa2x0_lcd_alloc_screen,
-	pxa2x0_lcd_free_screen,
-	lcd_show_screen,
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	lcd_burner
+	.ioctl = lcd_ioctl,
+	.mmap = pxa2x0_lcd_mmap,
+	.alloc_screen = pxa2x0_lcd_alloc_screen,
+	.free_screen = pxa2x0_lcd_free_screen,
+	.show_screen = lcd_show_screen,
+	.burn_screen = lcd_burner
 };
 
 struct cfattach lcd_pxaip_ca = {
diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c
index cdcd80dbab4..87b6a707659 100644
--- a/sys/dev/ic/sti.c
+++ b/sys/dev/ic/sti.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sti.c,v 1.66 2013/10/18 17:38:33 miod Exp $	*/
+/*	$OpenBSD: sti.c,v 1.67 2013/10/20 20:07:29 miod Exp $	*/
 
 /*
  * Copyright (c) 2000-2003 Michael Shalayeff
@@ -84,12 +84,11 @@ int	sti_show_screen(void *, void *, int, void (*)(void *, int, int),
 	    void *);
 
 const struct wsdisplay_accessops sti_accessops = {
-	sti_ioctl,
-	sti_mmap,
-	sti_alloc_screen,
-	sti_free_screen,
-	sti_show_screen,
-	NULL			/* load_font */
+	.ioctl = sti_ioctl,
+	.mmap = sti_mmap,
+	.alloc_screen = sti_alloc_screen,
+	.free_screen = sti_free_screen,
+	.show_screen = sti_show_screen
 };
 
 enum sti_bmove_funcs {
diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index bc7cf4e190f..1f97a286aaa 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga.c,v 1.59 2013/10/19 14:32:45 miod Exp $ */
+/* $OpenBSD: vga.c,v 1.60 2013/10/20 20:07:29 miod Exp $ */
 /* $NetBSD: vga.c,v 1.28.2.1 2000/06/30 16:27:47 simonb Exp $ */
 
 /*-
@@ -252,15 +252,15 @@ int	vga_getchar(void *, int, int, struct wsdisplay_charcell *);
 void vga_doswitch(struct vga_config *);
 
 const struct wsdisplay_accessops vga_accessops = {
-	vga_ioctl,
-	vga_mmap,
-	vga_alloc_screen,
-	vga_free_screen,
-	vga_show_screen,
-	vga_load_font,
-	vga_scrollback,
-	vga_getchar,
-	vga_burner
+	.ioctl = vga_ioctl,
+	.mmap = vga_mmap,
+	.alloc_screen = vga_alloc_screen,
+	.free_screen = vga_free_screen,
+	.show_screen = vga_show_screen,
+	.load_font = vga_load_font,
+	.scrollback = vga_scrollback,
+	.getchar = vga_getchar,
+	.burn_screen = vga_burner
 };
 
 /*
diff --git a/sys/dev/isa/pcdisplay.c b/sys/dev/isa/pcdisplay.c
index 864fb2e4a29..8b581588ecb 100644
--- a/sys/dev/isa/pcdisplay.c
+++ b/sys/dev/isa/pcdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcdisplay.c,v 1.11 2010/08/28 12:48:14 miod Exp $ */
+/* $OpenBSD: pcdisplay.c,v 1.12 2013/10/20 20:07:29 miod Exp $ */
 /* $NetBSD: pcdisplay.c,v 1.9.4.1 2000/06/30 16:27:48 simonb Exp $ */
 
 /*
@@ -114,12 +114,11 @@ static int pcdisplay_show_screen(void *, void *, int,
 				 void (*) (void *, int, int), void *);
 
 const struct wsdisplay_accessops pcdisplay_accessops = {
-	pcdisplay_ioctl,
-	pcdisplay_mmap,
-	pcdisplay_alloc_screen,
-	pcdisplay_free_screen,
-	pcdisplay_show_screen,
-	0 /* load_font */
+	.ioctl = pcdisplay_ioctl,
+	.mmap = pcdisplay_mmap,
+	.alloc_screen = pcdisplay_alloc_screen,
+	.free_screen = pcdisplay_free_screen,
+	.show_screen = pcdisplay_show_screen
 };
 
 static int
diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c
index ad82c1a96bb..6e14a849aff 100644
--- a/sys/dev/pci/drm/i915/i915_drv.c
+++ b/sys/dev/pci/drm/i915/i915_drv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i915_drv.c,v 1.40 2013/10/20 10:43:47 miod Exp $ */
+/* $OpenBSD: i915_drv.c,v 1.41 2013/10/20 20:07:29 miod Exp $ */
 /*
  * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org>
  *
@@ -607,15 +607,13 @@ struct wsscreen_list inteldrm_screenlist = {
 };
 
 struct wsdisplay_accessops inteldrm_accessops = {
-	inteldrm_wsioctl,
-	inteldrm_wsmmap,
-	inteldrm_alloc_screen,
-	inteldrm_free_screen,
-	inteldrm_show_screen,
-	NULL,
-	NULL,
-	inteldrm_getchar,
-	inteldrm_burner
+	.ioctl = inteldrm_wsioctl,
+	.mmap = inteldrm_wsmmap,
+	.alloc_screen = inteldrm_alloc_screen,
+	.free_screen = inteldrm_free_screen,
+	.show_screen = inteldrm_show_screen,
+	.getchar = inteldrm_getchar,
+	.burn_screen = inteldrm_burner
 };
 
 extern int (*ws_get_param)(struct wsdisplay_param *);
diff --git a/sys/dev/pci/drm/radeon/radeon_kms.c b/sys/dev/pci/drm/radeon/radeon_kms.c
index 3e876a9645f..49793debd55 100644
--- a/sys/dev/pci/drm/radeon/radeon_kms.c
+++ b/sys/dev/pci/drm/radeon/radeon_kms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radeon_kms.c,v 1.8 2013/10/20 10:43:48 miod Exp $	*/
+/*	$OpenBSD: radeon_kms.c,v 1.9 2013/10/20 20:07:29 miod Exp $	*/
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
  * Copyright 2008 Red Hat Inc.
@@ -317,15 +317,13 @@ struct wsscreen_list radeondrm_screenlist = {
 };
 
 struct wsdisplay_accessops radeondrm_accessops = {
-	radeondrm_wsioctl,
-	radeondrm_wsmmap,
-	radeondrm_alloc_screen,
-	radeondrm_free_screen,
-	radeondrm_show_screen,
-	NULL,
-	NULL,
-	radeondrm_getchar,
-	radeondrm_burner
+	.ioctl = radeondrm_wsioctl,
+	.mmap = radeondrm_wsmmap,
+	.alloc_screen = radeondrm_alloc_screen,
+	.free_screen = radeondrm_free_screen,
+	.show_screen = radeondrm_show_screen,
+	.getchar = radeondrm_getchar,
+	.burn_screen = radeondrm_burner
 };
 
 int
diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c
index 4ad9b192eb3..66a132cbf83 100644
--- a/sys/dev/pci/tga.c
+++ b/sys/dev/pci/tga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tga.c,v 1.36 2011/04/07 15:30:16 miod Exp $ */
+/* $OpenBSD: tga.c,v 1.37 2013/10/20 20:07:30 miod Exp $ */
 /* $NetBSD: tga.c,v 1.40 2002/03/13 15:05:18 ad Exp $ */
 
 /*
@@ -153,15 +153,12 @@ struct wsscreen_list tga_screenlist = {
 };
 
 struct wsdisplay_accessops tga_accessops = {
-	tga_ioctl,
-	tga_mmap,
-	tga_alloc_screen,
-	tga_free_screen,
-	tga_show_screen,
-	NULL,			/* load_font */
-	NULL,			/* scrollback */
-	NULL,			/* getchar */
-	tga_burner,
+	.ioctl = tga_ioctl,
+	.mmap = tga_mmap,
+	.alloc_screen = tga_alloc_screen,
+	.free_screen = tga_free_screen,
+	.show_screen = tga_show_screen,
+	.burn_screen = tga_burner
 };
 
 void	tga_blank(struct tga_devconfig *);
diff --git a/sys/dev/pcmcia/cfxga.c b/sys/dev/pcmcia/cfxga.c
index efbe02bf046..6be8d59828d 100644
--- a/sys/dev/pcmcia/cfxga.c
+++ b/sys/dev/pcmcia/cfxga.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cfxga.c,v 1.23 2013/06/11 18:15:55 deraadt Exp $	*/
+/*	$OpenBSD: cfxga.c,v 1.24 2013/10/20 20:07:30 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, Matthieu Herrb and Miodrag Vallat
@@ -118,15 +118,12 @@ int	cfxga_show_screen(void *, void *, int, void (*)(void *, int, int),
 	    void *);
 
 struct wsdisplay_accessops cfxga_accessops = {
-	cfxga_ioctl,
-	cfxga_mmap,
-	cfxga_alloc_screen,
-	cfxga_free_screen,
-	cfxga_show_screen,
-	NULL,
-	NULL,
-	NULL,
-	cfxga_burner
+	.ioctl = cfxga_ioctl,
+	.mmap = cfxga_mmap,
+	.alloc_screen = cfxga_alloc_screen,
+	.free_screen = cfxga_free_screen,
+	.show_screen = cfxga_show_screen,
+	.burn_screen = cfxga_burner
 };
 
 /*
diff --git a/sys/dev/sbus/agten.c b/sys/dev/sbus/agten.c
index 3757f7c14b0..53d84a26ab3 100644
--- a/sys/dev/sbus/agten.c
+++ b/sys/dev/sbus/agten.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agten.c,v 1.9 2008/12/27 17:23:03 miod Exp $	*/
+/*	$OpenBSD: agten.c,v 1.10 2013/10/20 20:07:30 miod Exp $	*/
 /*
  * Copyright (c) 2002, 2003, Miodrag Vallat.
  * All rights reserved.
@@ -115,15 +115,8 @@ int agten_putcmap(struct agten_cmap *, struct wsdisplay_cmap *);
 void agten_loadcmap(struct agten_softc *, u_int, u_int);
 
 struct wsdisplay_accessops agten_accessops = {
-	agten_ioctl,
-	agten_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,   /* load_font */
-	NULL,   /* scrollback */
-	NULL,   /* getchar */
-	NULL,	/* burner */
+	.ioctl = agten_ioctl,
+	.mmap = agten_mmap
 };
 
 int agtenmatch(struct device *, void *, void *);
diff --git a/sys/dev/sbus/bwtwo.c b/sys/dev/sbus/bwtwo.c
index 425f67baba4..dbedf2e3c88 100644
--- a/sys/dev/sbus/bwtwo.c
+++ b/sys/dev/sbus/bwtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwtwo.c,v 1.18 2008/12/27 17:23:03 miod Exp $	*/
+/*	$OpenBSD: bwtwo.c,v 1.19 2013/10/20 20:07:30 miod Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -109,15 +109,9 @@ int bwtwo_is_console(int);
 void bwtwo_burner(void *, u_int, u_int);
 
 struct wsdisplay_accessops bwtwo_accessops = {
-	bwtwo_ioctl,
-	bwtwo_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	bwtwo_burner,
+	.ioctl = bwtwo_ioctl,
+	.mmap = bwtwo_mmap,
+	.burn_screen = bwtwo_burner
 };
 
 int	bwtwomatch(struct device *, void *, void *);
diff --git a/sys/dev/sbus/cgsix.c b/sys/dev/sbus/cgsix.c
index 8f673614b63..bb5db224d79 100644
--- a/sys/dev/sbus/cgsix.c
+++ b/sys/dev/sbus/cgsix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgsix.c,v 1.58 2009/09/05 14:09:35 miod Exp $	*/
+/*	$OpenBSD: cgsix.c,v 1.59 2013/10/20 20:07:30 miod Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -74,15 +74,9 @@ int cgsix_setcursor(struct cgsix_softc *, struct wsdisplay_cursor *);
 int cgsix_updatecursor(struct cgsix_softc *, u_int);
 
 struct wsdisplay_accessops cgsix_accessops = {
-	cgsix_ioctl,
-	cgsix_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	cgsix_burner,
+	.ioctl = cgsix_ioctl,
+	.mmap = cgsix_mmap,
+	.burn_screen = cgsix_burner
 };
 
 int	cgsixmatch(struct device *, void *, void *);
diff --git a/sys/dev/sbus/cgthree.c b/sys/dev/sbus/cgthree.c
index cbf5c45e706..123ad85a54b 100644
--- a/sys/dev/sbus/cgthree.c
+++ b/sys/dev/sbus/cgthree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgthree.c,v 1.44 2008/12/27 17:23:03 miod Exp $	*/
+/*	$OpenBSD: cgthree.c,v 1.45 2013/10/20 20:07:30 miod Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -138,15 +138,9 @@ void cgthree_burner(void *, u_int, u_int);
 void cgthree_reset(struct cgthree_softc *);
 
 struct wsdisplay_accessops cgthree_accessops = {
-	cgthree_ioctl,
-	cgthree_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	cgthree_burner,
+	.ioctl = cgthree_ioctl,
+	.mmap = cgthree_mmap,
+	.burn_screen = cgthree_burner
 };
 
 int	cgthreematch(struct device *, void *, void *);
diff --git a/sys/dev/sbus/cgtwelve.c b/sys/dev/sbus/cgtwelve.c
index 3b1f5856216..3caede633b1 100644
--- a/sys/dev/sbus/cgtwelve.c
+++ b/sys/dev/sbus/cgtwelve.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgtwelve.c,v 1.7 2013/05/31 22:07:45 deraadt Exp $	*/
+/*	$OpenBSD: cgtwelve.c,v 1.8 2013/10/20 20:07:30 miod Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003 Miodrag Vallat.  All rights reserved.
@@ -98,15 +98,8 @@ static __inline__ void cgtwelve_ramdac_wraddr(struct cgtwelve_softc *sc,
 	    u_int32_t addr);
 
 struct wsdisplay_accessops cgtwelve_accessops = {
-	cgtwelve_ioctl,
-	cgtwelve_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	NULL	/* burner */
+	.ioctl = cgtwelve_ioctl,
+	.mmap = cgtwelve_mmap
 };
 
 int	cgtwelvematch(struct device *, void *, void *);
diff --git a/sys/dev/sbus/mgx.c b/sys/dev/sbus/mgx.c
index d0a235b0a76..5ddecb7775a 100644
--- a/sys/dev/sbus/mgx.c
+++ b/sys/dev/sbus/mgx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mgx.c,v 1.12 2009/09/05 14:09:35 miod Exp $	*/
+/*	$OpenBSD: mgx.c,v 1.13 2013/10/20 20:07:31 miod Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -133,15 +133,9 @@ int	mgx_ioctl(void *, u_long, caddr_t, int, struct proc *);
 paddr_t	mgx_mmap(void *, off_t, int);
 
 struct wsdisplay_accessops mgx_accessops = {
-	mgx_ioctl,
-	mgx_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	mgx_burner
+	.ioctl = mgx_ioctl,
+	.mmap = mgx_mmap,
+	.burn_screen = mgx_burner
 };
 
 int	mgx_getcmap(u_int8_t *, struct wsdisplay_cmap *);
diff --git a/sys/dev/sbus/rfx.c b/sys/dev/sbus/rfx.c
index 4f54b2fa3f1..9542c5bdff3 100644
--- a/sys/dev/sbus/rfx.c
+++ b/sys/dev/sbus/rfx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rfx.c,v 1.9 2008/12/27 17:23:03 miod Exp $	*/
+/*	$OpenBSD: rfx.c,v 1.10 2013/10/20 20:07:31 miod Exp $	*/
 
 /*
  * Copyright (c) 2004, Miodrag Vallat.
@@ -133,15 +133,9 @@ int	rfx_putcmap(struct rfx_cmap *, struct wsdisplay_cmap *);
 void	rfx_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
 
 struct wsdisplay_accessops rfx_accessops = {
-	rfx_ioctl,
-	rfx_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	rfx_burner,
+	.ioctl = rfx_ioctl,
+	.mmap = rfx_mmap,
+	.burn_screen = rfx_burner
 };
 
 int	rfxmatch(struct device *, void *, void *);
diff --git a/sys/dev/sbus/tvtwo.c b/sys/dev/sbus/tvtwo.c
index f87d173dfba..d3bf769576a 100644
--- a/sys/dev/sbus/tvtwo.c
+++ b/sys/dev/sbus/tvtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tvtwo.c,v 1.14 2008/12/27 17:23:03 miod Exp $	*/
+/*	$OpenBSD: tvtwo.c,v 1.15 2013/10/20 20:07:31 miod Exp $	*/
 
 /*
  * Copyright (c) 2003, 2006, 2008, Miodrag Vallat.
@@ -130,15 +130,9 @@ paddr_t	tvtwo_mmap(void *, off_t, int);
 void	tvtwo_burner(void *, u_int, u_int);
 
 struct wsdisplay_accessops tvtwo_accessops = {
-	tvtwo_ioctl,
-	tvtwo_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	tvtwo_burner,
+	.ioctl = tvtwo_ioctl,
+	.mmap = tvtwo_mmap,
+	.burn_screen = tvtwo_burner
 };
 
 void	tvtwo_directcmap(struct tvtwo_softc *);
diff --git a/sys/dev/sbus/vigra.c b/sys/dev/sbus/vigra.c
index e789f7d4988..c767cc08667 100644
--- a/sys/dev/sbus/vigra.c
+++ b/sys/dev/sbus/vigra.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vigra.c,v 1.11 2008/12/27 17:23:03 miod Exp $	*/
+/*	$OpenBSD: vigra.c,v 1.12 2013/10/20 20:07:31 miod Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003, Miodrag Vallat.
@@ -196,15 +196,9 @@ void vigra_burner(void *, u_int, u_int);
 int vigra_intr(void *);
 
 struct wsdisplay_accessops vigra_accessops = {
-	vigra_ioctl,
-	vigra_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	vigra_burner,
+	.ioctl = vigra_ioctl,
+	.mmap = vigra_mmap,
+	.burn_screen = vigra_burner
 };
 
 int	vigramatch(struct device *, void *, void *);
diff --git a/sys/dev/sbus/zx.c b/sys/dev/sbus/zx.c
index 184d2188077..e84ca3d73a3 100644
--- a/sys/dev/sbus/zx.c
+++ b/sys/dev/sbus/zx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zx.c,v 1.18 2013/09/28 06:43:42 mlarkin Exp $	*/
+/*	$OpenBSD: zx.c,v 1.19 2013/10/20 20:07:31 miod Exp $	*/
 /*	$NetBSD: zx.c,v 1.5 2002/10/02 16:52:46 thorpej Exp $	*/
 
 /*
@@ -127,15 +127,9 @@ void zx_reset(struct zx_softc *, u_int);
 void zx_burner(void *, u_int, u_int);
 
 struct wsdisplay_accessops zx_accessops = {
-	zx_ioctl,
-	zx_mmap,
-	NULL,	/* alloc_screen */
-	NULL,	/* free_screen */
-	NULL,	/* show_screen */
-	NULL,	/* load_font */
-	NULL,	/* scrollback */
-	NULL,	/* getchar */
-	zx_burner
+	.ioctl = zx_ioctl,
+	.mmap = zx_mmap,
+	.burn_screen = zx_burner
 };
 
 /* Force 32-bit writes. */
diff --git a/sys/dev/usb/udl.c b/sys/dev/usb/udl.c
index b392b804804..b26c2398dc8 100644
--- a/sys/dev/usb/udl.c
+++ b/sys/dev/usb/udl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udl.c,v 1.76 2013/05/30 16:15:02 deraadt Exp $ */
+/*	$OpenBSD: udl.c,v 1.77 2013/10/20 20:07:31 miod Exp $ */
 
 /*
  * Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org>
@@ -212,15 +212,12 @@ struct wsscreen_list udl_screenlist = {
 };
 
 struct wsdisplay_accessops udl_accessops = {
-	udl_ioctl,
-	udl_mmap,
-	udl_alloc_screen,
-	udl_free_screen,
-	udl_show_screen,
-	NULL,
-	NULL,
-	NULL,
-	udl_burner
+	.ioctl = udl_ioctl,
+	.mmap = udl_mmap,
+	.alloc_screen = udl_alloc_screen,
+	.free_screen = udl_free_screen,
+	.show_screen = udl_show_screen,
+	.burn_screen = udl_burner
 };
 
 /*