Previous fix was half-done, move the wsscreen_list array into the softc

as well.

6 files changed, 15 insertions, 15 deletions

diff --git a/sys/arch/hp300/dev/diofb.c b/sys/arch/hp300/dev/diofb.c
index a408c05493d..c3159e5b9b5 100644
--- a/sys/arch/hp300/dev/diofb.c
+++ b/sys/arch/hp300/dev/diofb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diofb.c,v 1.9 2006/03/12 22:22:39 miod Exp $	*/
+/*	$OpenBSD: diofb.c,v 1.10 2006/03/12 22:52:59 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat
@@ -300,7 +300,6 @@ diofb_end_attach(void *sc, struct wsdisplay_accessops *accessops,
     struct diofb *fb, int console, const char *descr)
 {
 	struct wsemuldisplaydev_attach_args waa;
-	struct wsscreen_descr *scrlist[1];
 
 	printf(": %dx%d", fb->dwidth, fb->dheight);
 
@@ -313,9 +312,9 @@ diofb_end_attach(void *sc, struct wsdisplay_accessops *accessops,
 		printf(" %s", descr);
 	printf(" frame buffer\n");
 
-	scrlist[0] = &fb->wsd;
+	fb->scrlist[0] = &fb->wsd;
 	fb->wsl.nscreens = 1;
-	fb->wsl.screens = (const struct wsscreen_descr **)scrlist;
+	fb->wsl.screens = (const struct wsscreen_descr **)fb->scrlist;
 
 	waa.console = console;
 	waa.scrdata = &fb->wsl;
diff --git a/sys/arch/hp300/dev/diofbvar.h b/sys/arch/hp300/dev/diofbvar.h
index c3304ba24ee..e7a37ee1f38 100644
--- a/sys/arch/hp300/dev/diofbvar.h
+++ b/sys/arch/hp300/dev/diofbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diofbvar.h,v 1.6 2006/03/12 22:22:39 miod Exp $	*/
+/*	$OpenBSD: diofbvar.h,v 1.7 2006/03/12 22:52:59 miod Exp $	*/
 
 /*
  * Copyright (c) 2005, Miodrag Vallat
@@ -92,6 +92,7 @@ struct diofb {
 	/* wsdisplay information */
 	struct wsscreen_descr wsd;
 	struct wsscreen_list wsl;
+	struct wsscreen_descr *scrlist[1];
 	int	nscreens;
 	u_int	mapmode;
 
diff --git a/sys/arch/sparc/dev/fb.c b/sys/arch/sparc/dev/fb.c
index a1f7d23d097..19f6c8a9c6d 100644
--- a/sys/arch/sparc/dev/fb.c
+++ b/sys/arch/sparc/dev/fb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fb.c,v 1.35 2006/03/12 22:17:47 miod Exp $	*/
+/*	$OpenBSD: fb.c,v 1.36 2006/03/12 22:53:01 miod Exp $	*/
 /*	$NetBSD: fb.c,v 1.23 1997/07/07 23:30:22 pk Exp $ */
 
 /*
@@ -463,7 +463,6 @@ void
 fbwscons_attach(struct sunfb *sf, struct wsdisplay_accessops *op, int isconsole)
 {
 	struct wsemuldisplaydev_attach_args waa;
-	struct wsscreen_descr *scrlist[1];
 
 	if (isconsole == 0) {
 		/* done in wsdisplay_cnattach() earlier if console */
@@ -481,9 +480,9 @@ fbwscons_attach(struct sunfb *sf, struct wsdisplay_accessops *op, int isconsole)
 		op->show_screen = fb_show_screen;
 	}
 
-	scrlist[0] = &sf->sf_wsd;
+	sf->sf_scrlist[0] = &sf->sf_wsd;
 	sf->sf_wsl.nscreens = 1;
-	sf->sf_wsl.screens = (const struct wsscreen_descr **)scrlist;
+	sf->sf_wsl.screens = (const struct wsscreen_descr **)sf->sf_scrlist;
 
 	waa.console = isconsole;
 	waa.scrdata = &sf->sf_wsl;
diff --git a/sys/arch/sparc/include/fbvar.h b/sys/arch/sparc/include/fbvar.h
index e6699e2a181..da9c82235c1 100644
--- a/sys/arch/sparc/include/fbvar.h
+++ b/sys/arch/sparc/include/fbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fbvar.h,v 1.15 2006/03/12 22:17:48 miod Exp $	*/
+/*	$OpenBSD: fbvar.h,v 1.16 2006/03/12 22:53:01 miod Exp $	*/
 /*	$NetBSD: fbvar.h,v 1.9 1997/07/07 23:31:30 pk Exp $ */
 
 /*
@@ -71,6 +71,7 @@ struct sunfb {
 
 	struct	wsscreen_descr sf_wsd;
 	struct	wsscreen_list sf_wsl;
+	struct	wsscreen_descr *sf_scrlist[1];
 	int	sf_nscreens;
 };
 
diff --git a/sys/arch/sparc64/dev/fb.c b/sys/arch/sparc64/dev/fb.c
index 42e6b4f5143..d5c94e5bab1 100644
--- a/sys/arch/sparc64/dev/fb.c
+++ b/sys/arch/sparc64/dev/fb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fb.c,v 1.9 2006/03/12 22:17:50 miod Exp $	*/
+/*	$OpenBSD: fb.c,v 1.10 2006/03/12 22:53:02 miod Exp $	*/
 /*	$NetBSD: fb.c,v 1.23 1997/07/07 23:30:22 pk Exp $ */
 
 /*
@@ -280,7 +280,6 @@ void
 fbwscons_attach(struct sunfb *sf, struct wsdisplay_accessops *op, int isconsole)
 {
 	struct wsemuldisplaydev_attach_args waa;
-	struct wsscreen_descr *scrlist[1];
 
 	if (isconsole == 0) {
 		/* done in wsdisplay_cnattach() earlier if console */
@@ -291,9 +290,9 @@ fbwscons_attach(struct sunfb *sf, struct wsdisplay_accessops *op, int isconsole)
 		fb_cookie = sf;
 	}
 
-	scrlist[0] = &sf->sf_wsd;
+	sf->sf_scrlist[0] = &sf->sf_wsd;
 	sf->sf_wsl.nscreens = 1;
-	sf->sf_wsl.screens = (const struct wsscreen_descr **)scrlist;
+	sf->sf_wsl.screens = (const struct wsscreen_descr **)sf->sf_scrlist;
 
 	waa.console = isconsole;
 	waa.scrdata = &sf->sf_wsl;
diff --git a/sys/arch/sparc64/include/fbvar.h b/sys/arch/sparc64/include/fbvar.h
index f3a76864f67..59a1aeb38bd 100644
--- a/sys/arch/sparc64/include/fbvar.h
+++ b/sys/arch/sparc64/include/fbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fbvar.h,v 1.5 2006/03/12 22:17:51 miod Exp $	*/
+/*	$OpenBSD: fbvar.h,v 1.6 2006/03/12 22:53:02 miod Exp $	*/
 /*	$NetBSD: fbvar.h,v 1.9 1997/07/07 23:31:30 pk Exp $ */
 
 /*
@@ -61,6 +61,7 @@ struct sunfb {
 
 	struct	wsscreen_descr sf_wsd;
 	struct	wsscreen_list sf_wsl;
+	struct	wsscreen_descr *sf_scrlist[1];
 };
 
 /*