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

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

details:   https://anonhg.NetBSD.org/src/rev/d1a8c2bbd4ae
branches:  netbsd-3
changeset: 576028:d1a8c2bbd4ae
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jun 07 18:04:39 2005 +0000

description:
Pull up revision 1.17 (requested by martin in ticket #376):
added missing ffb_ras_wait()

diffstat:

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

diffs (50 lines):

diff -r 414de5020b0e -r d1a8c2bbd4ae sys/arch/sparc64/dev/ffb.c
--- a/sys/arch/sparc64/dev/ffb.c        Tue Jun 07 18:03:55 2005 +0000
+++ b/sys/arch/sparc64/dev/ffb.c        Tue Jun 07 18:04:39 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffb.c,v 1.8.10.8 2005/06/07 18:03:55 tron Exp $        */
+/*     $NetBSD: ffb.c,v 1.8.10.9 2005/06/07 18:04:39 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.8 2005/06/07 18:03:55 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.8.10.9 2005/06/07 18:04:39 tron Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -615,6 +615,7 @@
        memmove(&scr->chars[to], &scr->chars[from], ncols * sizeof(uint16_t));
 
        if ((scr->active) && (sc->sc_mode == WSDISPLAYIO_MODE_EMUL)) {
+               ffb_ras_wait(sc);
                sc->copycols(cookie, row, srccol, dstcol, ncols);
        }
 }
@@ -810,6 +811,7 @@
        long *attrptr = scr->attrs;
        
        ffb_clearscreen(scr->sc);
+       ffb_ras_wait(scr->sc);
        for (i = 0; i < scr->ri.ri_rows; i++) {
                for (j = 0; j < scr->ri.ri_cols; j++) {
                        scr->sc->putchar(scr, i, j, charptr[offset], 
@@ -839,6 +841,7 @@
                        /* remove cursor */
                        coffset = scr->cursorcol + 
                            (scr->cursorrow * ri->ri_cols);
+                       ffb_ras_wait(sc);
                        sc->putchar(cookie, scr->cursorrow, scr->cursorcol, 
                            scr->chars[coffset], scr->attrs[coffset]);
                        scr->cursordrawn = 0;
@@ -858,6 +861,7 @@
 #else
                        revattr = attr ^ 0xffff0000;
 #endif
+                       ffb_ras_wait(sc);
                        sc->putchar(cookie, scr->cursorrow, scr->cursorcol, 
                            scr->chars[coffset], revattr);
                        scr->cursordrawn = 1;