[src/trunk]: src/sys G/C ri_delta.

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

details:   https://anonhg.NetBSD.org/src/rev/2c8a55be82ae
branches:  trunk
changeset: 458537:2c8a55be82ae
user:      rin <rin%NetBSD.org@localhost>
date:      Wed Jul 31 02:09:02 2019 +0000

description:
G/C ri_delta.

XXX
Bump kernel version after other changes for struct rasops_info.

diffstat:

 sys/arch/luna68k/dev/omrasops.c |   5 ++---
 sys/dev/rasops/rasops.c         |  11 ++---------
 sys/dev/rasops/rasops.h         |   3 +--
 3 files changed, 5 insertions(+), 14 deletions(-)

diffs (82 lines):

diff -r fd20b9ea477b -r 2c8a55be82ae sys/arch/luna68k/dev/omrasops.c
--- a/sys/arch/luna68k/dev/omrasops.c   Wed Jul 31 02:04:14 2019 +0000
+++ b/sys/arch/luna68k/dev/omrasops.c   Wed Jul 31 02:09:02 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: omrasops.c,v 1.20 2018/06/06 01:49:08 maya Exp $ */
+/* $NetBSD: omrasops.c,v 1.21 2019/07/31 02:09:02 rin Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: omrasops.c,v 1.20 2018/06/06 01:49:08 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omrasops.c,v 1.21 2019/07/31 02:09:02 rin Exp $");
 
 /*
  * Designed speficically for 'm68k bitorder';
@@ -1202,7 +1202,6 @@
        ri->ri_cols = ri->ri_emuwidth / ri->ri_font->fontwidth;
        ri->ri_rows = ri->ri_emuheight / ri->ri_font->fontheight;
        ri->ri_emustride = ri->ri_emuwidth * bpp >> 3;
-       ri->ri_delta = ri->ri_stride - ri->ri_emustride;
        ri->ri_ccol = 0;
        ri->ri_crow = 0;
        ri->ri_pelbytes = bpp >> 3;
diff -r fd20b9ea477b -r 2c8a55be82ae sys/dev/rasops/rasops.c
--- a/sys/dev/rasops/rasops.c   Wed Jul 31 02:04:14 2019 +0000
+++ b/sys/dev/rasops/rasops.c   Wed Jul 31 02:09:02 2019 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: rasops.c,v 1.103 2019/07/31 02:04:14 rin Exp $        */
+/*      $NetBSD: rasops.c,v 1.104 2019/07/31 02:09:02 rin Exp $        */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.103 2019/07/31 02:04:14 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.104 2019/07/31 02:09:02 rin Exp $");
 
 #include "opt_rasops.h"
 #include "rasops_glue.h"
@@ -417,7 +417,6 @@
                ri->ri_rows = ri->ri_emuheight / ri->ri_font->fontheight;
        }
        ri->ri_emustride = ri->ri_emuwidth * bpp >> 3;
-       ri->ri_delta = ri->ri_stride - ri->ri_emustride;
        ri->ri_ccol = 0;
        ri->ri_crow = 0;
        ri->ri_pelbytes = bpp >> 3;
@@ -426,12 +425,6 @@
        ri->ri_yscale = ri->ri_font->fontheight * ri->ri_stride;
        ri->ri_fontscale = ri->ri_font->fontheight * ri->ri_font->stride;
 
-       if ((ri->ri_delta & 3) != 0) {
-               aprint_error(
-                   "%s: ri_delta not aligned on 32-bit boundary", __func__);
-               splx(s);
-               return -1;
-       }
        ri->ri_origbits = ri->ri_bits;
        ri->ri_hworigbits = ri->ri_hwbits;
 
diff -r fd20b9ea477b -r 2c8a55be82ae sys/dev/rasops/rasops.h
--- a/sys/dev/rasops/rasops.h   Wed Jul 31 02:04:14 2019 +0000
+++ b/sys/dev/rasops/rasops.h   Wed Jul 31 02:09:02 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rasops.h,v 1.40 2019/07/31 02:04:14 rin Exp $ */
+/*     $NetBSD: rasops.h,v 1.41 2019/07/31 02:09:02 rin Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -113,7 +113,6 @@
        int     ri_emustride;   /* bytes per row we actually care about */
        int     ri_rows;        /* number of rows (characters, not pels) */
        int     ri_cols;        /* number of columns (characters, not pels) */
-       int     ri_delta;       /* row delta in bytes */
        int     ri_pelbytes;    /* bytes per pel (may be zero) */
        int     ri_fontscale;   /* fontheight * fontstride */
        int     ri_xscale;      /* fontwidth * pelbytes */