Use C99 named initializers for struct wsdisplay_accessops fields.

No functional change.

4 files changed, 26 insertions, 44 deletions

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[] = {