[src/netbsd-3]: src/sys/arch/sparc64/dev Pull up revision 1.18 (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/1abc89e03608
branches:  netbsd-3
changeset: 576029:1abc89e03608
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jun 07 18:05:12 2005 +0000

description:
Pull up revision 1.18 (requested by martin in ticket #376):
fixed a stupid typo that chained copycols to itself

diffstat:

 sys/arch/sparc64/dev/ffb.c |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r d1a8c2bbd4ae -r 1abc89e03608 sys/arch/sparc64/dev/ffb.c
--- a/sys/arch/sparc64/dev/ffb.c        Tue Jun 07 18:04:39 2005 +0000
+++ b/sys/arch/sparc64/dev/ffb.c        Tue Jun 07 18:05:12 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffb.c,v 1.8.10.9 2005/06/07 18:04:39 tron Exp $        */
+/*     $NetBSD: ffb.c,v 1.8.10.10 2005/06/07 18:05:12 tron 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.8.10.9 2005/06/07 18:04:39 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.8.10.10 2005/06/07 18:05:12 tron Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -154,7 +154,10 @@
        char buf[6+1];
 
        printf(":");
-
+       
+       sc->putchar = NULL;
+       sc->copycols = NULL;
+       
        if (sc->sc_type == FFB_CREATOR) {
                btype = prom_getpropint(sc->sc_node, "board_type", 0);
                if ((btype & 7) == 3)
@@ -195,7 +198,6 @@
 
        sc->sc_accel = ((sc->sc_dv.dv_cfdata->cf_flags & FFB_CFFLAG_NOACCEL) == 
            0);
-       sc->putchar = NULL;
                
        wsfont_init();
 
@@ -988,7 +990,6 @@
        /* enable acceleration */
        ri->ri_hw = scr;
        ri->ri_ops.copyrows = ffb_ras_copyrows;
-       ri->ri_ops.copycols = ffb_ras_copycols;
        ri->ri_ops.eraserows = ffb_ras_eraserows;
        ri->ri_ops.erasecols = ffb_ras_erasecols;
        ri->ri_ops.cursor = ffb_cursor;
@@ -997,6 +998,8 @@
                sc->putchar = ri->ri_ops.putchar;
                sc->copycols = ri->ri_ops.copycols;
        ri->ri_ops.putchar = ffb_putchar;
+       ri->ri_ops.copycols = ffb_ras_copycols;
+       
        
        if (existing) {
                scr->active = 1;