Module Name: src Committed By: bouyer Date: Sun Oct 18 13:45:50 UTC 2009
Modified Files: src/sys/arch/sparc64/dev [netbsd-5]: ffb.c Log Message: Pull up following revision(s) (requested by macallan in ticket #972): sys/arch/sparc64/dev/ffb.c: revision 1.37 call vcons_replay_msgbuf() when appropriate To generate a diff of this commit: cvs rdiff -u -r1.35.4.1 -r1.35.4.2 src/sys/arch/sparc64/dev/ffb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/sparc64/dev/ffb.c diff -u src/sys/arch/sparc64/dev/ffb.c:1.35.4.1 src/sys/arch/sparc64/dev/ffb.c:1.35.4.2 --- src/sys/arch/sparc64/dev/ffb.c:1.35.4.1 Wed Feb 25 20:52:09 2009 +++ src/sys/arch/sparc64/dev/ffb.c Sun Oct 18 13:45:50 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ffb.c,v 1.35.4.1 2009/02/25 20:52:09 snj Exp $ */ +/* $NetBSD: ffb.c,v 1.35.4.2 2009/10/18 13:45:50 bouyer Exp $ */ /* $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $ */ /* @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.35.4.1 2009/02/25 20:52:09 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.35.4.2 2009/10/18 13:45:50 bouyer Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -239,11 +239,12 @@ sc->sc_fb.fb_device = &sc->sc_dv; fb_attach(&sc->sc_fb, sc->sc_console); + ffb_clearscreen(sc); + if (sc->sc_console) { wsdisplay_cnattach(&ffb_stdscreen, ri, 0, 0, defattr); + vcons_replay_msgbuf(&ffb_console_screen); } - - ffb_clearscreen(sc); waa.console = sc->sc_console; waa.scrdata = &ffb_screenlist; @@ -433,7 +434,6 @@ break; #endif } - return (-1); }