[src/trunk]: src/sys/arch/amiga/dev While in graphics mode, short-circuit tex...

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

details:   https://anonhg.NetBSD.org/src/rev/cf412f396c02
branches:  trunk
changeset: 569798:cf412f396c02
user:      is <is%NetBSD.org@localhost>
date:      Mon Sep 06 18:12:54 2004 +0000

description:
While in graphics mode, short-circuit text-mode functions that would destroy
graphics state. Same fix as ite_cl.c 1.4.
Problem reported, and original fix provided, by Pawel Chwalowski in PR 26788
(but had to be recreated because the original patch didn't apply due to
a whitespace problem).

diffstat:

 sys/arch/amiga/dev/ite_et.c |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (48 lines):

diff -r 40a0abd62028 -r cf412f396c02 sys/arch/amiga/dev/ite_et.c
--- a/sys/arch/amiga/dev/ite_et.c       Mon Sep 06 16:25:29 2004 +0000
+++ b/sys/arch/amiga/dev/ite_et.c       Mon Sep 06 18:12:54 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ite_et.c,v 1.6 2002/01/28 09:57:00 aymeric Exp $ */
+/*     $NetBSD: ite_et.c,v 1.7 2004/09/06 18:12:54 is Exp $ */
 
 /*
  * Copyright (c) 1995 Ezra Story
@@ -36,7 +36,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.6 2002/01/28 09:57:00 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.7 2004/09/06 18:12:54 is Exp $");
 
 #include "grfet.h"
 #if NGRFET > 0
@@ -159,6 +159,9 @@
        unsigned char attr;
        unsigned char *cp;
 
+       if (ip->flags & ITE_INGRF)
+               return;
+
        attr =(unsigned char) ((mode & ATTR_INV) ? (0x70) : (0x07));
        if (mode & ATTR_UL)     attr  = 0x01;   /* ???????? */
        if (mode & ATTR_BOLD)   attr |= 0x08;
@@ -183,6 +186,9 @@
        volatile unsigned char *ba = ip->grf->g_regkva;
        int len;
 
+       if (ip->flags & ITE_INGRF)
+               return;
+
        dst = ip->grf->g_fbkva + (sy * ip->cols) + sx;
        src = dst + (ip->rows*ip->cols);
        len = w*h;
@@ -200,6 +206,9 @@
        unsigned char *fb;
        volatile unsigned char *ba = ip->grf->g_regkva;
 
+       if (ip->flags & ITE_INGRF)
+               return;
+
        fb = ip->grf->g_fbkva + sy * ip->cols;
        SetTextPlane(ba, 0x00);