Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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).
This commit is contained in:
is 2004-09-06 18:12:54 +00:00
parent b19910cb19
commit 0297f3ae8c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arch/amiga/dev/ite_et.c
View File

@ -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 * Copyright (c) 1995 Ezra Story
@ -36,7 +36,7 @@
#include "opt_amigacons.h" #include "opt_amigacons.h"
#include <sys/cdefs.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" #include "grfet.h"
#if NGRFET > 0 #if NGRFET > 0
@ -159,6 +159,9 @@ et_putc(struct ite_softc *ip, int c, int dy, int dx, int mode)
unsigned char attr; unsigned char attr;
unsigned char *cp; unsigned char *cp;
if (ip->flags & ITE_INGRF)
return;
attr =(unsigned char) ((mode & ATTR_INV) ? (0x70) : (0x07)); attr =(unsigned char) ((mode & ATTR_INV) ? (0x70) : (0x07));
if (mode & ATTR_UL) attr = 0x01; /* ???????? */ if (mode & ATTR_UL) attr = 0x01; /* ???????? */
if (mode & ATTR_BOLD) attr |= 0x08; if (mode & ATTR_BOLD) attr |= 0x08;
@ -183,6 +186,9 @@ et_clear(struct ite_softc *ip, int sy, int sx, int h, int w)
volatile unsigned char *ba = ip->grf->g_regkva; volatile unsigned char *ba = ip->grf->g_regkva;
int len; int len;
if (ip->flags & ITE_INGRF)
return;
dst = ip->grf->g_fbkva + (sy * ip->cols) + sx; dst = ip->grf->g_fbkva + (sy * ip->cols) + sx;
src = dst + (ip->rows*ip->cols); src = dst + (ip->rows*ip->cols);
len = w*h; len = w*h;
@ -200,6 +206,9 @@ et_scroll(struct ite_softc *ip, int sy, int sx, int count, int dir)
unsigned char *fb; unsigned char *fb;
volatile unsigned char *ba = ip->grf->g_regkva; volatile unsigned char *ba = ip->grf->g_regkva;
if (ip->flags & ITE_INGRF)
return;
fb = ip->grf->g_fbkva + sy * ip->cols; fb = ip->grf->g_fbkva + sy * ip->cols;
SetTextPlane(ba, 0x00); SetTextPlane(ba, 0x00);