[src/trunk]: src/sys/arch/hpcmips/dev hardware accelarate function parameters...

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

details:   https://anonhg.NetBSD.org/src/rev/caff14221298
branches:  trunk
changeset: 499663:caff14221298
user:      sato <sato%NetBSD.org@localhost>
date:      Sun Nov 26 06:21:16 2000 +0000

description:
hardware accelarate function parameters turn to dot base.

diffstat:

 sys/arch/hpcmips/dev/hpcfb.c |  48 ++++++++++++++++++++++----------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diffs (105 lines):

diff -r 298ca4328779 -r caff14221298 sys/arch/hpcmips/dev/hpcfb.c
--- a/sys/arch/hpcmips/dev/hpcfb.c      Sun Nov 26 06:03:24 2000 +0000
+++ b/sys/arch/hpcmips/dev/hpcfb.c      Sun Nov 26 06:21:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hpcfb.c,v 1.17 2000/11/24 22:05:13 sato Exp $  */
+/*     $NetBSD: hpcfb.c,v 1.18 2000/11/26 06:21:16 sato Exp $  */
 
 /*-
  * Copyright (c) 1999
@@ -46,7 +46,7 @@
 static const char _copyright[] __attribute__ ((unused)) =
     "Copyright (c) 1999 Shin Takemura.  All rights reserved.";
 static const char _rcsid[] __attribute__ ((unused)) =
-    "$Id: hpcfb.c,v 1.17 2000/11/24 22:05:13 sato Exp $";
+    "$Id: hpcfb.c,v 1.18 2000/11/26 06:21:16 sato Exp $";
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -928,10 +928,10 @@
 
        dc->dc_state |= HPCFB_DC_DRAWING;
        if (sc && sc->sc_accessops->cursor) {
-               xoff = col * ri->ri_xscale;
-               yoff = row * ri->ri_yscale;
+               xoff = col * ri->ri_font->fontwidth;
+               yoff = row * ri->ri_font->fontheight;
                curheight = ri->ri_font->fontheight;
-               curwidth = ri->ri_xscale;
+               curwidth = ri->ri_font->fontwidth;
                (*sc->sc_accessops->cursor)(sc->sc_accessctx,
                                on, xoff, yoff, curwidth, curheight);
        } else 
@@ -1023,8 +1023,8 @@
        dc->dc_state |= HPCFB_DC_DRAWING;
        if (sc && sc->sc_accessops->putchar 
               && (dc->dc_state&HPCFB_DC_CURRENT)) {
-               yoff = row * ri->ri_yscale;
-               xoff =  col * ri->ri_xscale;
+               yoff = row * ri->ri_font->fontheight;
+               xoff =  col * ri->ri_font->fontwidth;
                fclr = ri->ri_devcmap[((u_int)attr >> 24) & 15];
                uclr = ri->ri_devcmap[((u_int)attr >> 16) & 15];
 
@@ -1097,12 +1097,12 @@
        dc->dc_state |= HPCFB_DC_DRAWING;
        if (sc && sc->sc_accessops->bitblit
               && (dc->dc_state&HPCFB_DC_CURRENT)) {
-               srcxoff = srccol * ri->ri_xscale;
-               srcyoff = row * ri->ri_yscale;
-               dstxoff = dstcol * ri->ri_xscale;
-               dstyoff = row * ri->ri_yscale;
-               width = ncols * ri->ri_xscale;
-               height = ri->ri_yscale;
+               srcxoff = srccol * ri->ri_font->fontwidth;
+               srcyoff = row * ri->ri_font->fontheight;
+               dstxoff = dstcol * ri->ri_font->fontwidth;
+               dstyoff = row * ri->ri_font->fontheight;
+               width = ncols * ri->ri_font->fontwidth;
+               height = ri->ri_font->fontheight;
                (*sc->sc_accessops->bitblit)(sc->sc_accessctx,
                        srcxoff, srcyoff, dstxoff, dstyoff, height, width);
        } else
@@ -1170,10 +1170,10 @@
        dc->dc_state |= HPCFB_DC_DRAWING;
        if (sc && sc->sc_accessops->erase
               && (dc->dc_state&HPCFB_DC_CURRENT)) {
-               xoff = startcol * ri->ri_xscale;
-               yoff = row * ri->ri_yscale;
-               width = ncols * ri->ri_xscale;
-               height = ri->ri_yscale;
+               xoff = startcol * ri->ri_font->fontwidth;
+               yoff = row * ri->ri_font->fontheight;
+               width = ncols * ri->ri_font->fontwidth;
+               height = ri->ri_font->fontheight;
                (*sc->sc_accessops->erase)(sc->sc_accessctx,
                        xoff, yoff, height, width, attr);
        } else 
@@ -1358,10 +1358,10 @@
        if (sc && sc->sc_accessops->bitblit
               && (dc->dc_state&HPCFB_DC_CURRENT)) {
                dc->dc_state |= HPCFB_DC_DRAWING;
-               srcyoff = src * ri->ri_yscale;
-               dstyoff = dst * ri->ri_yscale;
-               width = ri->ri_stride;
-               height = num * ri->ri_yscale;
+               srcyoff = src * ri->ri_font->fontheight;
+               dstyoff = dst * ri->ri_font->fontheight;
+               width = dc->dc_cols * ri->ri_font->fontwidth;
+               height = num * ri->ri_font->fontheight;
                (*sc->sc_accessops->bitblit)(sc->sc_accessctx,
                        0, srcyoff, 0, dstyoff, height, width);
                dc->dc_state &= ~HPCFB_DC_DRAWING;
@@ -1465,9 +1465,9 @@
        dc->dc_state |= HPCFB_DC_DRAWING;
        if (sc && sc->sc_accessops->erase
               && (dc->dc_state&HPCFB_DC_CURRENT)) {
-               yoff = row * ri->ri_yscale;
-               width = ri->ri_stride;
-               height = nrow * ri->ri_yscale;
+               yoff = row * ri->ri_font->fontheight;
+               width = dc->dc_cols * ri->ri_font->fontwidth;
+               height = nrow * ri->ri_font->fontheight;
                (*sc->sc_accessops->erase)(sc->sc_accessctx,
                        0, yoff, height, width, attr);
        } else