[src/trunk]: src/sys/dev/sun don't muck with the screen description if we're ...

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

details:   https://anonhg.NetBSD.org/src/rev/fdbbe34433f7
branches:  trunk
changeset: 757697:fdbbe34433f7
user:      macallan <macallan%NetBSD.org@localhost>
date:      Tue Sep 14 18:42:12 2010 +0000

description:
don't muck with the screen description if we're not the console, for some
reason this leads to a NULL jump later on, at least on sparc64
should fix PR43873

diffstat:

 sys/dev/sun/cgsix.c |  18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)

diffs (39 lines):

diff -r 3ea35b8c56c0 -r fdbbe34433f7 sys/dev/sun/cgsix.c
--- a/sys/dev/sun/cgsix.c       Tue Sep 14 18:28:18 2010 +0000
+++ b/sys/dev/sun/cgsix.c       Tue Sep 14 18:42:12 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgsix.c,v 1.47 2010/05/04 05:11:06 macallan Exp $ */
+/*     $NetBSD: cgsix.c,v 1.48 2010/09/14 18:42:12 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.47 2010/05/04 05:11:06 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.48 2010/09/14 18:42:12 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -637,20 +637,6 @@
                 * we're not the console so we just clear the screen and don't 
                 * set up any sort of text display
                 */
-               if (cgsix_defaultscreen.textops == NULL) {
-                       /* 
-                        * ugly, but...
-                        * we want the console settings to win, so we only
-                        * touch anything when we find an untouched screen
-                        * definition. In this case we fill it from fb to
-                        * avoid problems in case no cgsix is the console
-                        */
-                       ri = &sc->sc_fb.fb_rinfo;
-                       cgsix_defaultscreen.textops = &ri->ri_ops;
-                       cgsix_defaultscreen.capabilities = ri->ri_caps;
-                       cgsix_defaultscreen.nrows = ri->ri_rows;
-                       cgsix_defaultscreen.ncols = ri->ri_cols;
-               }
        }
        
        aa.scrdata = &cgsix_screenlist;