[src/netbsd-1-5]: src/sys/arch/amiga/dev Sync to -current (with releng permis...

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

details:   https://anonhg.NetBSD.org/src/rev/beeb2c295d98
branches:  netbsd-1-5
changeset: 488260:beeb2c295d98
user:      is <is%NetBSD.org@localhost>
date:      Sun Jun 25 20:49:49 2000 +0000

description:
Sync to -current (with releng permission):
Only plot font_width pixel colums even for bold chars.
The excess column would have been overwritten by the next sequentially written
character anyway. Besides, the C methods did not do this right at all.
As a result, a 640 pixel column screen now holds 80 character columns.

diffstat:

 sys/arch/amiga/dev/ite_cc.c |  40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 deletions(-)

diffs (108 lines):

diff -r 869d7c52349a -r beeb2c295d98 sys/arch/amiga/dev/ite_cc.c
--- a/sys/arch/amiga/dev/ite_cc.c       Sun Jun 25 20:30:20 2000 +0000
+++ b/sys/arch/amiga/dev/ite_cc.c       Sun Jun 25 20:49:49 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ite_cc.c,v 1.28 2000/05/24 19:36:29 is Exp $   */
+/*     $NetBSD: ite_cc.c,v 1.28.4.1 2000/06/25 20:49:49 is Exp $       */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -85,7 +85,10 @@
 extern u_char kernel_font[], kernel_cursor[];
 
 
+#if !defined(USE_C_BFOPS) && !defined(__m68k__)
 #define USE_C_BFOPS
+#endif
+
 #if !defined(USE_C_BFOPS)
 #define BFEXT(v,p,o,w) asm("bfextu %1@{%2:%3},%0" : "=d" (v) : \
                "a"(p), "d"(o), "d"(w))
@@ -213,8 +216,7 @@
         */
        cci->view = views[0].view; 
 
-       /* -1 for bold. */
-       ip->cols = (cci->view->display.width - 1) / ip->ftwidth; 
+       ip->cols = cci->view->display.width / ip->ftwidth; 
        ip->rows = cci->view->display.height / ip->ftheight;
 
        /*
@@ -586,8 +588,8 @@
     
     while (fh--) {
        ch = *f++;
-       ch |= ch << 1;
-       BFINS(ch,p,co,fw+1);
+       ch |= ch >> 1;
+       BFINS(ch,p,co,fw);
        p += ro;
     }
 }
@@ -606,8 +608,8 @@
     
     while (fh--) {
        ch = *f++;
-       ch |= ch << 1;
-       BFINS(~ch,p,co,fw+1);
+       ch |= ch >> 1;
+       BFINS(~ch,p,co,fw);
        p += ro;
     }
 }
@@ -628,21 +630,21 @@
 
     while (underline--) {
        ch = *f++;
-       ch |= ch << 1;
-       BFINS(ch,p,co,fw+1);
+       ch |= ch >> 1;
+       BFINS(ch,p,co,fw);
        p += ro;
     }
 
     ch = *f++;
-    ch |= ch << 1;
-    BFINS(expbits(ch),p,co,fw+1);
+    ch |= ch >> 1;
+    BFINS(expbits(ch),p,co,fw);
     p += ro;
 
     underline = fh - cci->underline - 1;
     while (underline--) {
        ch = *f++;
-       ch |= ch << 1;
-       BFINS(ch,p,co,fw+1);
+       ch |= ch >> 1;
+       BFINS(ch,p,co,fw);
        p += ro;
     }
 }
@@ -663,21 +665,21 @@
     
     while (underline--) {
        ch = *f++;
-       ch |= ch << 1;
-       BFINS(~ch,p,co,fw+1);
+       ch |= ch >> 1;
+       BFINS(~ch,p,co,fw);
        p += ro;
     }
 
     ch = *f++;
-    ch |= ch << 1;
-    BFINS(~expbits(ch),p,co,fw+1);
+    ch |= ch >> 1;
+    BFINS(~expbits(ch),p,co,fw);
     p += ro;
 
     underline = fh - cci->underline - 1;
     while (underline--) {
        ch = *f++;
-       ch |= ch << 1;
-       BFINS(~ch,p,co,fw+1);
+       ch |= ch >> 1;
+       BFINS(~ch,p,co,fw);
        p += ro;
     }
 }