Module Name: src
Committed By: rin
Date: Wed Jul 31 02:09:02 UTC 2019
Modified Files:
src/sys/arch/luna68k/dev: omrasops.c
src/sys/dev/rasops: rasops.c rasops.h
Log Message:
G/C ri_delta.
XXX
Bump kernel version after other changes for struct rasops_info.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/luna68k/dev/omrasops.c
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/rasops/rasops.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/rasops/rasops.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/dev/omrasops.c
diff -u src/sys/arch/luna68k/dev/omrasops.c:1.20 src/sys/arch/luna68k/dev/omrasops.c:1.21
--- src/sys/arch/luna68k/dev/omrasops.c:1.20 Wed Jun 6 01:49:08 2018
+++ src/sys/arch/luna68k/dev/omrasops.c Wed Jul 31 02:09:02 2019
@@ -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 @@ omrasops_init(struct rasops_info *ri, in
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;
Index: src/sys/dev/rasops/rasops.c
diff -u src/sys/dev/rasops/rasops.c:1.103 src/sys/dev/rasops/rasops.c:1.104
--- src/sys/dev/rasops/rasops.c:1.103 Wed Jul 31 02:04:14 2019
+++ src/sys/dev/rasops/rasops.c Wed Jul 31 02:09:02 2019
@@ -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 @@ rasops_reconfig(struct rasops_info *ri,
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 @@ rasops_reconfig(struct rasops_info *ri,
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;
Index: src/sys/dev/rasops/rasops.h
diff -u src/sys/dev/rasops/rasops.h:1.40 src/sys/dev/rasops/rasops.h:1.41
--- src/sys/dev/rasops/rasops.h:1.40 Wed Jul 31 02:04:14 2019
+++ src/sys/dev/rasops/rasops.h Wed Jul 31 02:09:02 2019
@@ -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 @@ struct rasops_info {
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 */
