diff options
| -rw-r--r-- | sys/arch/sparc/dev/fb.c | 9 | ||||
| -rw-r--r-- | sys/arch/sparc/include/fbvar.h | 3 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/fb.c | 9 | ||||
| -rw-r--r-- | sys/arch/sparc64/include/fbvar.h | 3 |
4 files changed, 12 insertions, 12 deletions
diff --git a/sys/arch/sparc/dev/fb.c b/sys/arch/sparc/dev/fb.c index d3fef4d283a..a1f7d23d097 100644 --- a/sys/arch/sparc/dev/fb.c +++ b/sys/arch/sparc/dev/fb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fb.c,v 1.34 2005/03/23 17:16:34 miod Exp $ */ +/* $OpenBSD: fb.c,v 1.35 2006/03/12 22:17:47 miod Exp $ */ /* $NetBSD: fb.c,v 1.23 1997/07/07 23:30:22 pk Exp $ */ /* @@ -464,7 +464,6 @@ fbwscons_attach(struct sunfb *sf, struct wsdisplay_accessops *op, int isconsole) { struct wsemuldisplaydev_attach_args waa; struct wsscreen_descr *scrlist[1]; - struct wsscreen_list screenlist; if (isconsole == 0) { /* done in wsdisplay_cnattach() earlier if console */ @@ -483,11 +482,11 @@ fbwscons_attach(struct sunfb *sf, struct wsdisplay_accessops *op, int isconsole) } scrlist[0] = &sf->sf_wsd; - screenlist.nscreens = 1; - screenlist.screens = (const struct wsscreen_descr **)scrlist; + sf->sf_wsl.nscreens = 1; + sf->sf_wsl.screens = (const struct wsscreen_descr **)scrlist; waa.console = isconsole; - waa.scrdata = &screenlist; + waa.scrdata = &sf->sf_wsl; waa.accessops = op; waa.accesscookie = sf; config_found(&sf->sf_dev, &waa, wsemuldisplaydevprint); diff --git a/sys/arch/sparc/include/fbvar.h b/sys/arch/sparc/include/fbvar.h index ae15a42f13d..e6699e2a181 100644 --- a/sys/arch/sparc/include/fbvar.h +++ b/sys/arch/sparc/include/fbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fbvar.h,v 1.14 2005/03/23 17:16:36 miod Exp $ */ +/* $OpenBSD: fbvar.h,v 1.15 2006/03/12 22:17:48 miod Exp $ */ /* $NetBSD: fbvar.h,v 1.9 1997/07/07 23:31:30 pk Exp $ */ /* @@ -70,6 +70,7 @@ struct sunfb { struct rasops_info sf_ro; struct wsscreen_descr sf_wsd; + struct wsscreen_list sf_wsl; int sf_nscreens; }; diff --git a/sys/arch/sparc64/dev/fb.c b/sys/arch/sparc64/dev/fb.c index 5601b299f85..42e6b4f5143 100644 --- a/sys/arch/sparc64/dev/fb.c +++ b/sys/arch/sparc64/dev/fb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fb.c,v 1.8 2005/03/15 18:40:15 miod Exp $ */ +/* $OpenBSD: fb.c,v 1.9 2006/03/12 22:17:50 miod Exp $ */ /* $NetBSD: fb.c,v 1.23 1997/07/07 23:30:22 pk Exp $ */ /* @@ -281,7 +281,6 @@ fbwscons_attach(struct sunfb *sf, struct wsdisplay_accessops *op, int isconsole) { struct wsemuldisplaydev_attach_args waa; struct wsscreen_descr *scrlist[1]; - struct wsscreen_list screenlist; if (isconsole == 0) { /* done in wsdisplay_cnattach() earlier if console */ @@ -293,11 +292,11 @@ fbwscons_attach(struct sunfb *sf, struct wsdisplay_accessops *op, int isconsole) } scrlist[0] = &sf->sf_wsd; - screenlist.nscreens = 1; - screenlist.screens = (const struct wsscreen_descr **)scrlist; + sf->sf_wsl.nscreens = 1; + sf->sf_wsl.screens = (const struct wsscreen_descr **)scrlist; waa.console = isconsole; - waa.scrdata = &screenlist; + waa.scrdata = &sf->sf_wsl; waa.accessops = op; waa.accesscookie = sf; config_found(&sf->sf_dev, &waa, wsemuldisplaydevprint); diff --git a/sys/arch/sparc64/include/fbvar.h b/sys/arch/sparc64/include/fbvar.h index 386afda8cdd..f3a76864f67 100644 --- a/sys/arch/sparc64/include/fbvar.h +++ b/sys/arch/sparc64/include/fbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fbvar.h,v 1.4 2005/03/07 16:44:52 miod Exp $ */ +/* $OpenBSD: fbvar.h,v 1.5 2006/03/12 22:17:51 miod Exp $ */ /* $NetBSD: fbvar.h,v 1.9 1997/07/07 23:31:30 pk Exp $ */ /* @@ -60,6 +60,7 @@ struct sunfb { struct rasops_info sf_ro; struct wsscreen_descr sf_wsd; + struct wsscreen_list sf_wsl; }; /* |