Module Name: src
Committed By: bouyer
Date: Sun Oct 18 14:38:34 UTC 2009
Modified Files:
src/sys/dev/sun [netbsd-5]: cgsix.c
Log Message:
Back out ticket 978
To generate a diff of this commit:
cvs rdiff -u -r1.38.6.6 -r1.38.6.7 src/sys/dev/sun/cgsix.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/dev/sun/cgsix.c
diff -u src/sys/dev/sun/cgsix.c:1.38.6.6 src/sys/dev/sun/cgsix.c:1.38.6.7
--- src/sys/dev/sun/cgsix.c:1.38.6.6 Sun Oct 18 13:58:41 2009
+++ src/sys/dev/sun/cgsix.c Sun Oct 18 14:38:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.38.6.6 2009/10/18 13:58:41 bouyer Exp $ */
+/* $NetBSD: cgsix.c,v 1.38.6.7 2009/10/18 14:38:34 bouyer Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.38.6.6 2009/10/18 13:58:41 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.38.6.7 2009/10/18 14:38:34 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -616,9 +616,6 @@
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,
@@ -631,8 +628,7 @@
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);
- vcons_replay_msgbuf(&cg6_console_screen);
+ wsdisplay_cnattach(&cgsix_defaultscreen, ri, 0, 0, defattr);
} else {
/*
* we're not the console so we just clear the screen and don't
@@ -653,6 +649,9 @@
cgsix_defaultscreen.ncols = ri->ri_cols;
}
}
+
+ cg6_setup_palette(sc);
+ cgsix_clearscreen(sc);
aa.scrdata = &cgsix_screenlist;
aa.console = isconsole;
