[src/trunk]: src/sys call vcons_replay_msgbuf() when appropriate

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d87a100e787f
branches:  trunk
changeset: 746796:d87a100e787f
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Aug 20 02:49:30 2009 +0000

description:
call vcons_replay_msgbuf() when appropriate

diffstat:

 sys/arch/sparc64/dev/ffb.c |  10 +++++-----
 sys/dev/sun/cgsix.c        |  13 +++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diffs (89 lines):

diff -r 5e8d004a3a38 -r d87a100e787f sys/arch/sparc64/dev/ffb.c
--- a/sys/arch/sparc64/dev/ffb.c        Thu Aug 20 02:40:57 2009 +0000
+++ b/sys/arch/sparc64/dev/ffb.c        Thu Aug 20 02:49:30 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffb.c,v 1.36 2008/11/16 05:10:46 macallan Exp $        */
+/*     $NetBSD: ffb.c,v 1.37 2009/08/20 02:50:46 macallan 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.36 2008/11/16 05:10:46 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.37 2009/08/20 02:50:46 macallan 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);
 }
 
diff -r 5e8d004a3a38 -r d87a100e787f sys/dev/sun/cgsix.c
--- a/sys/dev/sun/cgsix.c       Thu Aug 20 02:40:57 2009 +0000
+++ b/sys/dev/sun/cgsix.c       Thu Aug 20 02:49:30 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgsix.c,v 1.44 2009/02/20 22:55:26 martin Exp $ */
+/*     $NetBSD: cgsix.c,v 1.45 2009/08/20 02:49:30 macallan Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.44 2009/02/20 22:55:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.45 2009/08/20 02:49:30 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -615,6 +615,9 @@
        vcons_init(&sc->vd, sc, &cgsix_defaultscreen, &cgsix_accessops);
        sc->vd.init_screen = cgsix_init_screen;
 
+       cg6_setup_palette(sc);
+       cgsix_clearscreen(sc);
+
        if(isconsole) {
                /* we mess with cg6_console_screen only once */
                vcons_init_screen(&sc->vd, &cg6_console_screen, 1,
@@ -627,7 +630,8 @@
                cgsix_defaultscreen.ncols = ri->ri_cols;
                SCREEN_VISIBLE(&cg6_console_screen);
                sc->vd.active = &cg6_console_screen;
-               wsdisplay_cnattach(&cgsix_defaultscreen, ri, 0, 0, defattr);    
+               wsdisplay_cnattach(&cgsix_defaultscreen, ri, 0, 0, defattr);
+               vcons_replay_msgbuf(&cg6_console_screen);
        } else {
                /* 
                 * we're not the console so we just clear the screen and don't 
@@ -648,9 +652,6 @@
                        cgsix_defaultscreen.ncols = ri->ri_cols;
                }
        }
-
-       cg6_setup_palette(sc);
-       cgsix_clearscreen(sc);
        
        aa.scrdata = &cgsix_screenlist;
        aa.console = isconsole;