diff options
Diffstat (limited to 'sys')
33 files changed, 74 insertions, 79 deletions
diff --git a/sys/arch/sparc/dev/agten.c b/sys/arch/sparc/dev/agten.c index 12a7187cdd6..5ed2ac2492d 100644 --- a/sys/arch/sparc/dev/agten.c +++ b/sys/arch/sparc/dev/agten.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agten.c,v 1.7 2005/01/05 23:04:24 miod Exp $ */ +/* $OpenBSD: agten.c,v 1.8 2005/03/07 16:44:50 miod Exp $ */ /* * Copyright (c) 2002, 2003, Miodrag Vallat. * All rights reserved. @@ -215,7 +215,7 @@ agtenattach(struct device *parent, struct device *self, void *args) fbwscons_setcolormap(&sc->sc_sunfb, agten_setcolor); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1, NULL); + fbwscons_console_init(&sc->sc_sunfb, -1); } sbus_establish(&sc->sc_sd, &sc->sc_sunfb.sf_dev); diff --git a/sys/arch/sparc/dev/bwtwo.c b/sys/arch/sparc/dev/bwtwo.c index ac34c0a1900..e520df2d46d 100644 --- a/sys/arch/sparc/dev/bwtwo.c +++ b/sys/arch/sparc/dev/bwtwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bwtwo.c,v 1.30 2005/03/01 21:21:24 miod Exp $ */ +/* $OpenBSD: bwtwo.c,v 1.31 2005/03/07 16:44:50 miod Exp $ */ /* $NetBSD: bwtwo.c,v 1.33 1997/05/24 20:16:02 pk Exp $ */ /* @@ -295,7 +295,7 @@ obp_name: fbwscons_init(&sc->sc_sunfb, isconsole ? 0 : RI_CLEAR); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1, bwtwo_burner); + fbwscons_console_init(&sc->sc_sunfb, -1); } #if defined(SUN4C) || defined(SUN4M) diff --git a/sys/arch/sparc/dev/cgeight.c b/sys/arch/sparc/dev/cgeight.c index 6fc94c2f09b..987b579cfae 100644 --- a/sys/arch/sparc/dev/cgeight.c +++ b/sys/arch/sparc/dev/cgeight.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgeight.c,v 1.23 2005/01/05 23:04:24 miod Exp $ */ +/* $OpenBSD: cgeight.c,v 1.24 2005/03/07 16:44:50 miod Exp $ */ /* $NetBSD: cgeight.c,v 1.13 1997/05/24 20:16:04 pk Exp $ */ /* @@ -219,7 +219,7 @@ cgeightattach(parent, self, args) sc->sc_sunfb.sf_height); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1, cgeight_burner); + fbwscons_console_init(&sc->sc_sunfb, -1); } fbwscons_attach(&sc->sc_sunfb, &cgeight_accessops, isconsole); diff --git a/sys/arch/sparc/dev/cgfour.c b/sys/arch/sparc/dev/cgfour.c index dd7b6982820..f1a44e4207d 100644 --- a/sys/arch/sparc/dev/cgfour.c +++ b/sys/arch/sparc/dev/cgfour.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgfour.c,v 1.23 2005/01/05 23:04:24 miod Exp $ */ +/* $OpenBSD: cgfour.c,v 1.24 2005/03/07 16:44:50 miod Exp $ */ /* $NetBSD: cgfour.c,v 1.13 1997/05/24 20:16:06 pk Exp $ */ /* @@ -229,7 +229,7 @@ cgfourattach(parent, self, args) printf(", %dx%d\n", sc->sc_sunfb.sf_width, sc->sc_sunfb.sf_height); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1, cgfour_burner); + fbwscons_console_init(&sc->sc_sunfb, -1); } fbwscons_attach(&sc->sc_sunfb, &cgfour_accessops, isconsole); diff --git a/sys/arch/sparc/dev/cgfourteen.c b/sys/arch/sparc/dev/cgfourteen.c index 705d905a92d..7c58b20d0c1 100644 --- a/sys/arch/sparc/dev/cgfourteen.c +++ b/sys/arch/sparc/dev/cgfourteen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgfourteen.c,v 1.27 2004/11/29 22:07:36 miod Exp $ */ +/* $OpenBSD: cgfourteen.c,v 1.28 2005/03/07 16:44:50 miod Exp $ */ /* $NetBSD: cgfourteen.c,v 1.7 1997/05/24 20:16:08 pk Exp $ */ /* @@ -317,7 +317,7 @@ cgfourteenattach(parent, self, args) fbwscons_setcolormap(&sc->sc_sunfb, cgfourteen_setcolor); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1, cgfourteen_burner); + fbwscons_console_init(&sc->sc_sunfb, -1); shutdownhook_establish(cgfourteen_prom, sc); } diff --git a/sys/arch/sparc/dev/cgsix.c b/sys/arch/sparc/dev/cgsix.c index 653d085b51c..b3195816b2e 100644 --- a/sys/arch/sparc/dev/cgsix.c +++ b/sys/arch/sparc/dev/cgsix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgsix.c,v 1.31 2005/01/05 23:04:24 miod Exp $ */ +/* $OpenBSD: cgsix.c,v 1.32 2005/03/07 16:44:50 miod Exp $ */ /* $NetBSD: cgsix.c,v 1.33 1997/08/07 19:12:30 pk Exp $ */ /* @@ -360,7 +360,7 @@ cgsixattach(parent, self, args) if (isconsole) { fbwscons_console_init(&sc->sc_sunfb, - sc->sc_sunfb.sf_width >= 1024 ? -1 : 0, cgsix_burner); + sc->sc_sunfb.sf_width >= 1024 ? -1 : 0); } #if defined(SUN4C) || defined(SUN4M) diff --git a/sys/arch/sparc/dev/cgthree.c b/sys/arch/sparc/dev/cgthree.c index 387591d6ab5..949098ddc52 100644 --- a/sys/arch/sparc/dev/cgthree.c +++ b/sys/arch/sparc/dev/cgthree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgthree.c,v 1.27 2005/01/05 23:04:24 miod Exp $ */ +/* $OpenBSD: cgthree.c,v 1.28 2005/03/07 16:44:50 miod Exp $ */ /* $NetBSD: cgthree.c,v 1.33 1997/05/24 20:16:11 pk Exp $ */ /* @@ -311,7 +311,7 @@ cgthreeattach(parent, self, args) if (isconsole) { fbwscons_console_init(&sc->sc_sunfb, - sc->sc_sunfb.sf_width >= 1024 ? -1 : 0, cgthree_burner); + sc->sc_sunfb.sf_width >= 1024 ? -1 : 0); } #if defined(SUN4C) || defined(SUN4M) diff --git a/sys/arch/sparc/dev/cgtwelve.c b/sys/arch/sparc/dev/cgtwelve.c index 7d6c0564f0a..ed5a2626d36 100644 --- a/sys/arch/sparc/dev/cgtwelve.c +++ b/sys/arch/sparc/dev/cgtwelve.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgtwelve.c,v 1.11 2005/03/03 09:49:05 miod Exp $ */ +/* $OpenBSD: cgtwelve.c,v 1.12 2005/03/07 16:44:50 miod Exp $ */ /* * Copyright (c) 2002, 2003 Miodrag Vallat. All rights reserved. @@ -215,7 +215,7 @@ cgtwelveattach(parent, self, args) fbwscons_init(&sc->sc_sunfb, isconsole ? 0 : RI_CLEAR); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1, NULL); + fbwscons_console_init(&sc->sc_sunfb, -1); shutdownhook_establish(cgtwelve_prom, sc); } diff --git a/sys/arch/sparc/dev/cgtwo.c b/sys/arch/sparc/dev/cgtwo.c index 2d243e25d71..d6da8228a8e 100644 --- a/sys/arch/sparc/dev/cgtwo.c +++ b/sys/arch/sparc/dev/cgtwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgtwo.c,v 1.31 2005/01/05 23:04:25 miod Exp $ */ +/* $OpenBSD: cgtwo.c,v 1.32 2005/03/07 16:44:50 miod Exp $ */ /* $NetBSD: cgtwo.c,v 1.22 1997/05/24 20:16:12 pk Exp $ */ /* @@ -244,7 +244,7 @@ cgtwoattach(parent, self, args) printf(", %dx%d\n", sc->sc_sunfb.sf_width, sc->sc_sunfb.sf_height); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1, cgtwo_burner); + fbwscons_console_init(&sc->sc_sunfb, -1); } fbwscons_attach(&sc->sc_sunfb, &cgtwo_accessops, isconsole); diff --git a/sys/arch/sparc/dev/fb.c b/sys/arch/sparc/dev/fb.c index 4246ba94791..306a6e3b36a 100644 --- a/sys/arch/sparc/dev/fb.c +++ b/sys/arch/sparc/dev/fb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fb.c,v 1.31 2005/02/27 22:25:34 miod Exp $ */ +/* $OpenBSD: fb.c,v 1.32 2005/03/07 16:44:50 miod Exp $ */ /* $NetBSD: fb.c,v 1.23 1997/07/07 23:30:22 pk Exp $ */ /* @@ -352,8 +352,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; @@ -411,10 +410,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 @@ -451,6 +446,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/sparc/dev/mgx.c b/sys/arch/sparc/dev/mgx.c index f7270a949d3..b7c079d1f05 100644 --- a/sys/arch/sparc/dev/mgx.c +++ b/sys/arch/sparc/dev/mgx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mgx.c,v 1.7 2005/03/03 09:49:05 miod Exp $ */ +/* $OpenBSD: mgx.c,v 1.8 2005/03/07 16:44:50 miod Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. * All rights reserved. @@ -199,7 +199,7 @@ mgxattach(struct device *parent, struct device *self, void *args) sc->sc_sunfb.sf_width, sc->sc_sunfb.sf_height); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1, mgx_burner); + fbwscons_console_init(&sc->sc_sunfb, -1); } sbus_establish(&sc->sc_sd, &sc->sc_sunfb.sf_dev); diff --git a/sys/arch/sparc/dev/p9000.c b/sys/arch/sparc/dev/p9000.c index d86580e927e..5e3a2fe0525 100644 --- a/sys/arch/sparc/dev/p9000.c +++ b/sys/arch/sparc/dev/p9000.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p9000.c,v 1.11 2005/01/05 23:04:25 miod Exp $ */ +/* $OpenBSD: p9000.c,v 1.12 2005/03/07 16:44:50 miod Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. @@ -281,7 +281,7 @@ p9000attach(struct device *parent, struct device *self, void *args) else row = -1; - fbwscons_console_init(&sc->sc_sunfb, row, p9000_burner); + fbwscons_console_init(&sc->sc_sunfb, row); } fbwscons_attach(&sc->sc_sunfb, &p9000_accessops, isconsole); diff --git a/sys/arch/sparc/dev/p9100.c b/sys/arch/sparc/dev/p9100.c index 8004709c5f9..8e7a0477cfc 100644 --- a/sys/arch/sparc/dev/p9100.c +++ b/sys/arch/sparc/dev/p9100.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p9100.c,v 1.32 2005/01/05 23:04:25 miod Exp $ */ +/* $OpenBSD: p9100.c,v 1.33 2005/03/07 16:44:50 miod Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. @@ -324,7 +324,7 @@ p9100attach(struct device *parent, struct device *self, void *args) else row = -1; - fbwscons_console_init(&sc->sc_sunfb, row, p9100_burner); + fbwscons_console_init(&sc->sc_sunfb, row); } fbwscons_attach(&sc->sc_sunfb, &p9100_accessops, isconsole); diff --git a/sys/arch/sparc/dev/rfx.c b/sys/arch/sparc/dev/rfx.c index 38393645ed6..401b42542e5 100644 --- a/sys/arch/sparc/dev/rfx.c +++ b/sys/arch/sparc/dev/rfx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rfx.c,v 1.7 2005/03/03 02:14:01 miod Exp $ */ +/* $OpenBSD: rfx.c,v 1.8 2005/03/07 16:44:50 miod Exp $ */ /* * Copyright (c) 2004, Miodrag Vallat. @@ -289,7 +289,7 @@ rfxattach(struct device *parent, struct device *self, void *args) fbwscons_setcolormap(&sc->sc_sunfb, rfx_setcolor); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1, rfx_burner); + fbwscons_console_init(&sc->sc_sunfb, -1); } /* enable video */ diff --git a/sys/arch/sparc/dev/tcx.c b/sys/arch/sparc/dev/tcx.c index 291894432a8..fa0511651f4 100644 --- a/sys/arch/sparc/dev/tcx.c +++ b/sys/arch/sparc/dev/tcx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcx.c,v 1.22 2005/03/07 01:28:45 miod Exp $ */ +/* $OpenBSD: tcx.c,v 1.23 2005/03/07 16:44:50 miod Exp $ */ /* $NetBSD: tcx.c,v 1.8 1997/07/29 09:58:14 fair Exp $ */ /* @@ -257,7 +257,7 @@ tcxattach(parent, self, args) self->dv_xname); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1, tcx_burner); + fbwscons_console_init(&sc->sc_sunfb, -1); shutdownhook_establish(tcx_prom, sc); } diff --git a/sys/arch/sparc/dev/tvtwo.c b/sys/arch/sparc/dev/tvtwo.c index 5f690e0cf00..87810215309 100644 --- a/sys/arch/sparc/dev/tvtwo.c +++ b/sys/arch/sparc/dev/tvtwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tvtwo.c,v 1.5 2005/01/05 23:04:25 miod Exp $ */ +/* $OpenBSD: tvtwo.c,v 1.6 2005/03/07 16:44:50 miod Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. * All rights reserved. @@ -238,7 +238,7 @@ tvtwoattach(struct device *parent, struct device *self, void *args) sc->sc_sunfb.sf_width, sc->sc_sunfb.sf_height); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1, NULL); + fbwscons_console_init(&sc->sc_sunfb, -1); } sbus_establish(&sc->sc_sd, &sc->sc_sunfb.sf_dev); diff --git a/sys/arch/sparc/dev/vigra.c b/sys/arch/sparc/dev/vigra.c index be415fb8e31..3df2c6f4644 100644 --- a/sys/arch/sparc/dev/vigra.c +++ b/sys/arch/sparc/dev/vigra.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vigra.c,v 1.13 2005/03/03 09:49:05 miod Exp $ */ +/* $OpenBSD: vigra.c,v 1.14 2005/03/07 16:44:50 miod Exp $ */ /* * Copyright (c) 2002, 2003, Miodrag Vallat. @@ -325,7 +325,7 @@ vigraattach(struct device *parent, struct device *self, void *args) break; } - fbwscons_console_init(&sc->sc_sunfb, row, vigra_burner); + fbwscons_console_init(&sc->sc_sunfb, row); } sbus_establish(&sc->sc_sd, &sc->sc_sunfb.sf_dev); diff --git a/sys/arch/sparc/dev/zx.c b/sys/arch/sparc/dev/zx.c index 29a82a7f830..4a44fb83a90 100644 --- a/sys/arch/sparc/dev/zx.c +++ b/sys/arch/sparc/dev/zx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zx.c,v 1.9 2005/03/01 21:21:24 miod Exp $ */ +/* $OpenBSD: zx.c,v 1.10 2005/03/07 16:44:50 miod Exp $ */ /* $NetBSD: zx.c,v 1.5 2002/10/02 16:52:46 thorpej Exp $ */ /* @@ -278,7 +278,7 @@ zx_attach(struct device *parent, struct device *self, void *args) if (isconsole) { /* zx_reset() below will clear screen, so restart at 1st row */ - fbwscons_console_init(&sc->sc_sunfb, 0, zx_burner); + fbwscons_console_init(&sc->sc_sunfb, 0); } /* reset cursor & frame buffer controls */ diff --git a/sys/arch/sparc/include/fbvar.h b/sys/arch/sparc/include/fbvar.h index 74733c58278..9bb3e9636d7 100644 --- a/sys/arch/sparc/include/fbvar.h +++ b/sys/arch/sparc/include/fbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fbvar.h,v 1.12 2004/11/29 22:07:39 miod Exp $ */ +/* $OpenBSD: fbvar.h,v 1.13 2005/03/07 16:44:52 miod Exp $ */ /* $NetBSD: fbvar.h,v 1.9 1997/07/07 23:31:30 pk Exp $ */ /* @@ -79,8 +79,7 @@ extern int fbnode; void fb_setsize(struct sunfb*, int, int, int, int, int); void fbwscons_init(struct sunfb *, int); -void fbwscons_console_init(struct sunfb *, int, - void (*)(void *, u_int, u_int)); +void fbwscons_console_init(struct sunfb *, int); void fbwscons_setcolormap(struct sunfb *, void (*)(void *, u_int, u_int8_t, u_int8_t, u_int8_t)); void fbwscons_attach(struct sunfb *, struct wsdisplay_accessops *, int); 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 */ } diff --git a/sys/arch/sparc64/include/fbvar.h b/sys/arch/sparc64/include/fbvar.h index d154cd185ea..386afda8cdd 100644 --- a/sys/arch/sparc64/include/fbvar.h +++ b/sys/arch/sparc64/include/fbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fbvar.h,v 1.3 2004/11/29 22:07:40 miod Exp $ */ +/* $OpenBSD: fbvar.h,v 1.4 2005/03/07 16:44:52 miod Exp $ */ /* $NetBSD: fbvar.h,v 1.9 1997/07/07 23:31:30 pk Exp $ */ /* @@ -69,8 +69,7 @@ extern int fbnode; void fb_setsize(struct sunfb*, int, int, int, int, int); void fbwscons_init(struct sunfb *, int); -void fbwscons_console_init(struct sunfb *, int, - void (*)(void *, u_int, u_int)); +void fbwscons_console_init(struct sunfb *, int); void fbwscons_setcolormap(struct sunfb *, void (*)(void *, u_int, u_int8_t, u_int8_t, u_int8_t)); void fbwscons_attach(struct sunfb *, struct wsdisplay_accessops *, int); diff --git a/sys/dev/sbus/agten.c b/sys/dev/sbus/agten.c index f7dba9dcf2b..9692977cd7e 100644 --- a/sys/dev/sbus/agten.c +++ b/sys/dev/sbus/agten.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agten.c,v 1.3 2005/01/05 23:04:25 miod Exp $ */ +/* $OpenBSD: agten.c,v 1.4 2005/03/07 16:44:52 miod Exp $ */ /* * Copyright (c) 2002, 2003, Miodrag Vallat. * All rights reserved. @@ -229,7 +229,7 @@ agtenattach(struct device *parent, struct device *self, void *args) fbwscons_setcolormap(&sc->sc_sunfb, agten_setcolor); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1, NULL); + fbwscons_console_init(&sc->sc_sunfb, -1); } sbus_establish(&sc->sc_sd, &sc->sc_sunfb.sf_dev); diff --git a/sys/dev/sbus/bwtwo.c b/sys/dev/sbus/bwtwo.c index 04361f9ec35..a8cd63d6b39 100644 --- a/sys/dev/sbus/bwtwo.c +++ b/sys/dev/sbus/bwtwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bwtwo.c,v 1.13 2005/03/01 21:23:36 miod Exp $ */ +/* $OpenBSD: bwtwo.c,v 1.14 2005/03/07 16:44:52 miod Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -209,7 +209,7 @@ bwtwoattach(parent, self, aux) if (console) { sc->sc_sunfb.sf_ro.ri_updatecursor = bwtwo_updatecursor; - fbwscons_console_init(&sc->sc_sunfb, -1, bwtwo_burner); + fbwscons_console_init(&sc->sc_sunfb, -1); } fbwscons_attach(&sc->sc_sunfb, &bwtwo_accessops, console); diff --git a/sys/dev/sbus/cgsix.c b/sys/dev/sbus/cgsix.c index 435895b9003..1f4fdb59eb2 100644 --- a/sys/dev/sbus/cgsix.c +++ b/sys/dev/sbus/cgsix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgsix.c,v 1.49 2005/03/03 01:52:41 miod Exp $ */ +/* $OpenBSD: cgsix.c,v 1.50 2005/03/07 16:44:52 miod Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -242,7 +242,7 @@ cgsixattach(struct device *parent, struct device *self, void *aux) if (console) { sc->sc_sunfb.sf_ro.ri_updatecursor = cgsix_ras_updatecursor; - fbwscons_console_init(&sc->sc_sunfb, -1, cgsix_burner); + fbwscons_console_init(&sc->sc_sunfb, -1); } fbwscons_attach(&sc->sc_sunfb, &cgsix_accessops, console); diff --git a/sys/dev/sbus/cgthree.c b/sys/dev/sbus/cgthree.c index 4644546cdb4..7af2d121778 100644 --- a/sys/dev/sbus/cgthree.c +++ b/sys/dev/sbus/cgthree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgthree.c,v 1.38 2005/03/01 21:23:36 miod Exp $ */ +/* $OpenBSD: cgthree.c,v 1.39 2005/03/07 16:44:52 miod Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -286,7 +286,7 @@ cgthreeattach(struct device *parent, struct device *self, void *aux) if (console) { sc->sc_sunfb.sf_ro.ri_updatecursor = cgthree_updatecursor; fbwscons_console_init(&sc->sc_sunfb, - sc->sc_sunfb.sf_width >= 1024 ? -1 : 0, cgthree_burner); + sc->sc_sunfb.sf_width >= 1024 ? -1 : 0); } fbwscons_attach(&sc->sc_sunfb, &cgthree_accessops, console); diff --git a/sys/dev/sbus/cgtwelve.c b/sys/dev/sbus/cgtwelve.c index 07dd5199454..55ed4545d5f 100644 --- a/sys/dev/sbus/cgtwelve.c +++ b/sys/dev/sbus/cgtwelve.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgtwelve.c,v 1.1 2005/03/05 01:49:03 miod Exp $ */ +/* $OpenBSD: cgtwelve.c,v 1.2 2005/03/07 16:44:52 miod Exp $ */ /* * Copyright (c) 2002, 2003 Miodrag Vallat. All rights reserved. @@ -241,7 +241,7 @@ cgtwelveattach(struct device *parent, struct device *self, void *args) fbwscons_init(&sc->sc_sunfb, isconsole ? 0 : RI_CLEAR); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1, NULL); + fbwscons_console_init(&sc->sc_sunfb, -1); shutdownhook_establish(cgtwelve_prom, sc); } diff --git a/sys/dev/sbus/mgx.c b/sys/dev/sbus/mgx.c index 97f380068db..a1439d75771 100644 --- a/sys/dev/sbus/mgx.c +++ b/sys/dev/sbus/mgx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mgx.c,v 1.3 2005/03/03 09:49:06 miod Exp $ */ +/* $OpenBSD: mgx.c,v 1.4 2005/03/07 16:44:52 miod Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. * All rights reserved. @@ -217,7 +217,7 @@ mgxattach(struct device *parent, struct device *self, void *args) sc->sc_sunfb.sf_width, sc->sc_sunfb.sf_height); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1, mgx_burner); + fbwscons_console_init(&sc->sc_sunfb, -1); } sbus_establish(&sc->sc_sd, &sc->sc_sunfb.sf_dev); diff --git a/sys/dev/sbus/rfx.c b/sys/dev/sbus/rfx.c index 3fab276b61e..db2ddcdb24b 100644 --- a/sys/dev/sbus/rfx.c +++ b/sys/dev/sbus/rfx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rfx.c,v 1.3 2005/03/03 02:14:02 miod Exp $ */ +/* $OpenBSD: rfx.c,v 1.4 2005/03/07 16:44:53 miod Exp $ */ /* * Copyright (c) 2004, Miodrag Vallat. @@ -309,7 +309,7 @@ rfxattach(struct device *parent, struct device *self, void *args) fbwscons_setcolormap(&sc->sc_sunfb, rfx_setcolor); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1, rfx_burner); + fbwscons_console_init(&sc->sc_sunfb, -1); } /* enable video */ diff --git a/sys/dev/sbus/tvtwo.c b/sys/dev/sbus/tvtwo.c index a18dea61718..dfbe5b40d2b 100644 --- a/sys/dev/sbus/tvtwo.c +++ b/sys/dev/sbus/tvtwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tvtwo.c,v 1.3 2005/01/05 23:04:25 miod Exp $ */ +/* $OpenBSD: tvtwo.c,v 1.4 2005/03/07 16:44:53 miod Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. * All rights reserved. @@ -254,7 +254,7 @@ tvtwoattach(struct device *parent, struct device *self, void *args) sc->sc_sunfb.sf_width, sc->sc_sunfb.sf_height); if (isconsole) { - fbwscons_console_init(&sc->sc_sunfb, -1, NULL); + fbwscons_console_init(&sc->sc_sunfb, -1); } sbus_establish(&sc->sc_sd, &sc->sc_sunfb.sf_dev); diff --git a/sys/dev/sbus/vigra.c b/sys/dev/sbus/vigra.c index 25bf19fb3ff..54a207c704f 100644 --- a/sys/dev/sbus/vigra.c +++ b/sys/dev/sbus/vigra.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vigra.c,v 1.6 2005/03/06 23:04:04 miod Exp $ */ +/* $OpenBSD: vigra.c,v 1.7 2005/03/07 16:44:53 miod Exp $ */ /* * Copyright (c) 2002, 2003, Miodrag Vallat. @@ -350,7 +350,7 @@ vigraattach(struct device *parent, struct device *self, void *args) break; } - fbwscons_console_init(&sc->sc_sunfb, row, vigra_burner); + fbwscons_console_init(&sc->sc_sunfb, row); } sbus_establish(&sc->sc_sd, &sc->sc_sunfb.sf_dev); diff --git a/sys/dev/sbus/zx.c b/sys/dev/sbus/zx.c index 3c411c63910..b676b4eed59 100644 --- a/sys/dev/sbus/zx.c +++ b/sys/dev/sbus/zx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zx.c,v 1.4 2005/03/01 21:21:25 miod Exp $ */ +/* $OpenBSD: zx.c,v 1.5 2005/03/07 16:44:53 miod Exp $ */ /* $NetBSD: zx.c,v 1.5 2002/10/02 16:52:46 thorpej Exp $ */ /* @@ -308,7 +308,7 @@ zx_attach(struct device *parent, struct device *self, void *args) if (isconsole) { /* zx_reset() below will clear screen, so restart at 1st row */ - fbwscons_console_init(&sc->sc_sunfb, 0, zx_burner); + fbwscons_console_init(&sc->sc_sunfb, 0); } /* reset cursor & frame buffer controls */ |