diff options
Diffstat (limited to 'sys/arch/sparc64/dev')
| -rw-r--r-- | sys/arch/sparc64/dev/creator.c | 5 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/fb.c | 13 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/vgafb.c | 4 |
3 files changed, 10 insertions, 12 deletions
diff --git a/sys/arch/sparc64/dev/creator.c b/sys/arch/sparc64/dev/creator.c index 46ac93358f0..aa234a112ae 100644 --- a/sys/arch/sparc64/dev/creator.c +++ b/sys/arch/sparc64/dev/creator.c @@ -1,4 +1,4 @@ -/* $OpenBSD: creator.c,v 1.31 2005/01/05 23:04:25 miod Exp $ */ +/* $OpenBSD: creator.c,v 1.32 2005/03/07 16:44:52 miod Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -138,8 +138,7 @@ creator_attach(struct creator_softc *sc) if (sc->sc_console) { sc->sc_sunfb.sf_ro.ri_updatecursor = creator_ras_updatecursor; - fbwscons_console_init(&sc->sc_sunfb, -1, - NULL); + fbwscons_console_init(&sc->sc_sunfb, -1); } fbwscons_attach(&sc->sc_sunfb, &creator_accessops, sc->sc_console); diff --git a/sys/arch/sparc64/dev/fb.c b/sys/arch/sparc64/dev/fb.c index fd257bf332c..90bd0f806f7 100644 --- a/sys/arch/sparc64/dev/fb.c +++ b/sys/arch/sparc64/dev/fb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fb.c,v 1.6 2004/11/29 22:07:40 miod Exp $ */ +/* $OpenBSD: fb.c,v 1.7 2005/03/07 16:44:52 miod Exp $ */ /* $NetBSD: fb.c,v 1.23 1997/07/07 23:30:22 pk Exp $ */ /* @@ -174,8 +174,7 @@ fbwscons_init(struct sunfb *sf, int flags) } void -fbwscons_console_init(struct sunfb *sf, int row, - void (*burner)(void *, u_int, u_int)) +fbwscons_console_init(struct sunfb *sf, int row) { long defattr; @@ -233,10 +232,6 @@ fbwscons_console_init(struct sunfb *sf, int row, fb_initwsd(sf); wsdisplay_cnattach(&sf->sf_wsd, &sf->sf_ro, sf->sf_ro.ri_ccol, sf->sf_ro.ri_crow, defattr); - - /* remember screen burner routine */ - fb_burner = burner; - fb_cookie = sf; } void @@ -273,6 +268,10 @@ fbwscons_attach(struct sunfb *sf, struct wsdisplay_accessops *op, int isconsole) if (isconsole == 0) { /* done in wsdisplay_cnattach() earlier if console */ fb_initwsd(sf); + } else { + /* remember screen burner routine */ + fb_burner = op->burn_screen; + fb_cookie = sf; } scrlist[0] = &sf->sf_wsd; diff --git a/sys/arch/sparc64/dev/vgafb.c b/sys/arch/sparc64/dev/vgafb.c index 477c1ea6d18..6bc930a5d84 100644 --- a/sys/arch/sparc64/dev/vgafb.c +++ b/sys/arch/sparc64/dev/vgafb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vgafb.c,v 1.38 2005/01/05 23:04:25 miod Exp $ */ +/* $OpenBSD: vgafb.c,v 1.39 2005/03/07 16:44:52 miod Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -172,7 +172,7 @@ vgafbattach(parent, self, aux) sc->sc_ofhandle = OF_stdout(); fbwscons_setcolormap(&sc->sc_sunfb, vgafb_setcolor); sc->sc_sunfb.sf_ro.ri_updatecursor = vgafb_updatecursor; - fbwscons_console_init(&sc->sc_sunfb, -1, NULL); + fbwscons_console_init(&sc->sc_sunfb, -1); } else { /* sc->sc_ofhandle = XXX */ } |