Hi tech@,
Unless I overlooked something, nothing seems to use the rasops2 (2-bit
color depth) functions.
It seems unlikely that any future new platform will ever need them.
Should we remove them?
Comments? OK?
Index: sys/conf/files
===================================================================
RCS file: /cvs/src/sys/conf/files,v
retrieving revision 1.635
diff -u -p -r1.635 files
--- sys/conf/files 30 Nov 2016 14:26:12 -0000 1.635
+++ sys/conf/files 11 Dec 2016 22:51:49 -0000
@@ -41,7 +41,6 @@ attach midi at midibus
# raster operations attributes
define rasops1
-define rasops2
define rasops4
define rasops8
define rasops15
Index: sys/dev/rasops/files.rasops
===================================================================
RCS file: /cvs/src/sys/dev/rasops/files.rasops,v
retrieving revision 1.6
diff -u -p -r1.6 files.rasops
--- sys/dev/rasops/files.rasops 2 Dec 2006 15:55:18 -0000 1.6
+++ sys/dev/rasops/files.rasops 11 Dec 2016 22:51:49 -0000
@@ -3,14 +3,13 @@
# Note: `rasops_glue' is only here to force the header file's name
# hence it must be mentioned first (shudder...)
-file dev/rasops/rasops.c ((rasops_glue | rasops1 | rasops2 | rasops4 |
- rasops8 | rasops15 | rasops16 | rasops24 |
- rasops32 | rasops_bswap | rasops_rotation) &
+file dev/rasops/rasops.c ((rasops_glue | rasops1 | rasops4 | rasops8 |
+ rasops15 | rasops16 | rasops24 | rasops32 |
+ rasops_bswap | rasops_rotation) &
wsdisplay) needs-flag
-file dev/rasops/rasops_masks.c wsdisplay & (rasops1 | rasops2 | rasops4)
+file dev/rasops/rasops_masks.c wsdisplay & (rasops1 | rasops4)
file dev/rasops/rasops1.c wsdisplay & rasops1
-file dev/rasops/rasops2.c wsdisplay & rasops2
file dev/rasops/rasops4.c wsdisplay & rasops4
file dev/rasops/rasops8.c wsdisplay & rasops8
file dev/rasops/rasops15.c wsdisplay & (rasops15 | rasops16)
Index: sys/dev/rasops/rasops.c
===================================================================
RCS file: /cvs/src/sys/dev/rasops/rasops.c,v
retrieving revision 1.43
diff -u -p -r1.43 rasops.c
--- sys/dev/rasops/rasops.c 26 Sep 2016 20:41:08 -0000 1.43
+++ sys/dev/rasops/rasops.c 11 Dec 2016 22:51:49 -0000
@@ -427,11 +427,6 @@ rasops_reconfig(struct rasops_info *ri,
rasops1_init(ri);
break;
#endif
-#if NRASOPS2 > 0
- case 2:
- rasops2_init(ri);
- break;
-#endif
#if NRASOPS4 > 0
case 4:
rasops4_init(ri);
@@ -802,16 +797,6 @@ rasops_init_devcmap(struct rasops_info *
}
switch (ri->ri_depth) {
-#if NRASOPS2 > 0
- case 2:
- for (i = 1; i < 15; i++)
- ri->ri_devcmap[i] = 0xaaaaaaaa;
-
- ri->ri_devcmap[0] = 0;
- ri->ri_devcmap[8] = 0x55555555;
- ri->ri_devcmap[15] = 0xffffffff;
- return;
-#endif
#if NRASOPS4 > 0
case 4:
for (i = 0; i < 16; i++) {
Index: sys/dev/rasops/rasops.h
===================================================================
RCS file: /cvs/src/sys/dev/rasops/rasops.h,v
retrieving revision 1.17
diff -u -p -r1.17 rasops.h
--- sys/dev/rasops/rasops.h 7 Sep 2015 18:00:58 -0000 1.17
+++ sys/dev/rasops/rasops.h 11 Dec 2016 22:51:49 -0000
@@ -158,7 +158,6 @@ struct rasops_info {
* the rasops code.
*/
void rasops1_init(struct rasops_info *);
-void rasops2_init(struct rasops_info *);
void rasops4_init(struct rasops_info *);
void rasops8_init(struct rasops_info *);
void rasops15_init(struct rasops_info *);
Index: sys/dev/rasops/rasops2.c
===================================================================
RCS file: sys/dev/rasops/rasops2.c
diff -N sys/dev/rasops/rasops2.c
--- sys/dev/rasops/rasops2.c 19 Dec 2014 22:44:59 -0000 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,461 +0,0 @@
-/* $OpenBSD: rasops2.c,v 1.11 2014/12/19 22:44:59 guenther Exp $ */
-/* $NetBSD: rasops2.c,v 1.5 2000/04/12 14:22:29 pk Exp $ */
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Andrew Doran.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/endian.h>
-
-#include <dev/wscons/wsdisplayvar.h>
-#include <dev/wscons/wsconsio.h>
-#include <dev/rasops/rasops.h>
-#include <dev/rasops/rasops_masks.h>
-
-int rasops2_copycols(void *, int, int, int, int);
-int rasops2_erasecols(void *, int, int, int, long);
-int rasops2_do_cursor(struct rasops_info *);
-int rasops2_putchar(void *, int, int col, u_int, long);
-u_int rasops2_mergebits(u_char *, int, int);
-#ifndef RASOPS_SMALL
-int rasops2_putchar8(void *, int, int col, u_int, long);
-int rasops2_putchar12(void *, int, int col, u_int, long);
-int rasops2_putchar16(void *, int, int col, u_int, long);
-void rasops2_makestamp(struct rasops_info *, long);
-
-/*
- * 4x1 stamp for optimized character blitting
- */
-static int8_t stamp[16];
-static long stamp_attr;
-static int stamp_mutex; /* XXX see note in README */
-#endif
-
-/*
- * Initialize rasops_info struct for this colordepth.
- */
-void
-rasops2_init(struct rasops_info *ri)
-{
- rasops_masks_init();
-
- switch (ri->ri_font->fontwidth) {
-#ifndef RASOPS_SMALL
- case 8:
- ri->ri_ops.putchar = rasops2_putchar8;
- break;
- case 12:
- ri->ri_ops.putchar = rasops2_putchar12;
- break;
- case 16:
- ri->ri_ops.putchar = rasops2_putchar16;
- break;
-#endif /* !RASOPS_SMALL */
- default:
- ri->ri_ops.putchar = rasops2_putchar;
- break;
- }
-
- if ((ri->ri_font->fontwidth & 3) != 0) {
- ri->ri_ops.erasecols = rasops2_erasecols;
- ri->ri_ops.copycols = rasops2_copycols;
- ri->ri_do_cursor = rasops2_do_cursor;
- }
-}
-
-/*
- * Compute a 2bpp expansion of a font element against the given colors.
- * Used by rasops2_putchar() below.
- */
-u_int
-rasops2_mergebits(u_char *fr, int fg, int bg)
-{
- u_int fb, bits;
- int mask, shift;
-
- fg &= 3;
- bg &= 3;
-
- bits = fr[1] | (fr[0] << 8);
- fb = 0;
- for (mask = 0x8000, shift = 32 - 2; mask != 0; mask >>= 1, shift -= 2)
- fb |= (bits & mask ? fg : bg) << shift;
-
- return (fb);
-}
-
-/*
- * Paint a single character. This is the generic version, this is ugly.
- */
-int
-rasops2_putchar(void *cookie, int row, int col, u_int uc, long attr)
-{
- int height, width, fs, rs, bg, fg, lmask, rmask;
- u_int fb;
- struct rasops_info *ri;
- int32_t *rp;
- u_char *fr;
-
- ri = (struct rasops_info *)cookie;
-
-#ifdef RASOPS_CLIPPING
- /* Catches 'row < 0' case too */
- if ((unsigned)row >= (unsigned)ri->ri_rows)
- return 0;
-
- if ((unsigned)col >= (unsigned)ri->ri_cols)
- return 0;
-#endif
-
- width = ri->ri_font->fontwidth << 1;
- height = ri->ri_font->fontheight;
- col *= width;
- rp = (int32_t *)(ri->ri_bits + row * ri->ri_yscale + ((col >> 3) & ~3));
- col = col & 31;
- rs = ri->ri_stride;
-
- bg = ri->ri_devcmap[(attr >> 16) & 0xf];
- fg = ri->ri_devcmap[(attr >> 24) & 0xf];
-
- /* If fg and bg match this becomes a space character */
- if (fg == bg || uc == ' ') {
- uc = (u_int)-1;
- fr = 0; /* shutup gcc */
- fs = 0; /* shutup gcc */
- } else {
- uc -= ri->ri_font->firstchar;
- fr = (u_char *)ri->ri_font->data + uc * ri->ri_fontscale;
- fs = ri->ri_font->stride;
- }
-
- /* Single word, one mask */
- if ((col + width) <= 32) {
- rmask = rasops_pmask[col][width];
- lmask = ~rmask;
-
- if (uc == (u_int)-1) {
- bg &= rmask;
-
- while (height--) {
- *rp = (*rp & lmask) | bg;
- DELTA(rp, rs, int32_t *);
- }
- } else {
- while (height--) {
- fb = rasops2_mergebits(fr, fg, bg);
- *rp = (*rp & lmask) |
- (MBE(fb >> col) & rmask);
-
- fr += fs;
- DELTA(rp, rs, int32_t *);
- }
- }
-
- /* Do underline */
- if (attr & 1) {
- DELTA(rp, -(ri->ri_stride << 1), int32_t *);
- *rp = (*rp & lmask) | (fg & rmask);
- }
- } else {
- lmask = ~rasops_lmask[col];
- rmask = ~rasops_rmask[(col + width) & 31];
-
- if (uc == (u_int)-1) {
- width = bg & ~rmask;
- bg = bg & ~lmask;
-
- while (height--) {
- rp[0] = (rp[0] & lmask) | bg;
- rp[1] = (rp[1] & rmask) | width;
- DELTA(rp, rs, int32_t *);
- }
- } else {
- width = 32 - col;
-
- while (height--) {
- fb = rasops2_mergebits(fr, fg, bg);
-
- rp[0] = (rp[0] & lmask) |
- MBE(fb >> col);
- rp[1] = (rp[1] & rmask) |
- (MBE(fb << width) & ~rmask);
-
- fr += fs;
- DELTA(rp, rs, int32_t *);
- }
- }
-
- /* Do underline */
- if (attr & 1) {
- DELTA(rp, -(ri->ri_stride << 1), int32_t *);
- rp[0] = (rp[0] & lmask) | (fg & ~lmask);
- rp[1] = (rp[1] & rmask) | (fg & ~rmask);
- }
- }
-
- return 0;
-}
-
-#ifndef RASOPS_SMALL
-/*
- * Recompute the blitting stamp.
- */
-void
-rasops2_makestamp(struct rasops_info *ri, long attr)
-{
- int i, fg, bg;
-
- fg = ri->ri_devcmap[(attr >> 24) & 0xf] & 3;
- bg = ri->ri_devcmap[(attr >> 16) & 0xf] & 3;
- stamp_attr = attr;
-
- for (i = 0; i < 16; i++) {
- stamp[i] = (i & 1 ? fg : bg);
- stamp[i] |= (i & 2 ? fg : bg) << 2;
- stamp[i] |= (i & 4 ? fg : bg) << 4;
- stamp[i] |= (i & 8 ? fg : bg) << 6;
- }
-}
-
-/*
- * Put a single character. This is for 8-pixel wide fonts.
- */
-int
-rasops2_putchar8(void *cookie, int row, int col, u_int uc, long attr)
-{
- struct rasops_info *ri;
- int height, fs, rs;
- u_char *fr, *rp;
-
- /* Can't risk remaking the stamp if it's already in use */
- if (stamp_mutex++) {
- stamp_mutex--;
- return rasops2_putchar(cookie, row, col, uc, attr);
- }
-
- ri = (struct rasops_info *)cookie;
-
-#ifdef RASOPS_CLIPPING
- /* Catches 'row < 0' case too */
- if ((unsigned)row >= (unsigned)ri->ri_rows) {
- stamp_mutex--;
- return 0;
- }
-
- if ((unsigned)col >= (unsigned)ri->ri_cols) {
- stamp_mutex--;
- return 0;
- }
-#endif
-
- rp = ri->ri_bits + row * ri->ri_yscale + col * ri->ri_xscale;
- height = ri->ri_font->fontheight;
- rs = ri->ri_stride;
-
- /* Recompute stamp? */
- if (attr != stamp_attr)
- rasops2_makestamp(ri, attr);
-
- if (uc == ' ') {
- int8_t c = stamp[0];
- while (height--) {
- *(int16_t *)rp = c;
- rp += rs;
- }
- } else {
- uc -= ri->ri_font->firstchar;
- fr = (u_char *)ri->ri_font->data + uc * ri->ri_fontscale;
- fs = ri->ri_font->stride;
-
- while (height--) {
- rp[0] = stamp[(*fr >> 4) & 0xf];
- rp[1] = stamp[*fr & 0xf];
- fr += fs;
- rp += rs;
- }
- }
-
- /* Do underline */
- if ((attr & 1) != 0)
- *(int16_t *)(rp - (ri->ri_stride << 1)) = stamp[15];
-
- stamp_mutex--;
-
- return 0;
-}
-
-/*
- * Put a single character. This is for 12-pixel wide fonts.
- */
-int
-rasops2_putchar12(void *cookie, int row, int col, u_int uc, long attr)
-{
- struct rasops_info *ri;
- int height, fs, rs;
- u_char *fr, *rp;
-
- /* Can't risk remaking the stamp if it's already in use */
- if (stamp_mutex++) {
- stamp_mutex--;
- return rasops2_putchar(cookie, row, col, uc, attr);
- }
-
- ri = (struct rasops_info *)cookie;
-
-#ifdef RASOPS_CLIPPING
- /* Catches 'row < 0' case too */
- if ((unsigned)row >= (unsigned)ri->ri_rows) {
- stamp_mutex--;
- return 0;
- }
-
- if ((unsigned)col >= (unsigned)ri->ri_cols) {
- stamp_mutex--;
- return 0;
- }
-#endif
-
- rp = ri->ri_bits + row * ri->ri_yscale + col * ri->ri_xscale;
- height = ri->ri_font->fontheight;
- rs = ri->ri_stride;
-
- /* Recompute stamp? */
- if (attr != stamp_attr)
- rasops2_makestamp(ri, attr);
-
- if (uc == ' ') {
- int8_t c = stamp[0];
- while (height--) {
- rp[0] = rp[1] = rp[2] = c;
- rp += rs;
- }
- } else {
- uc -= ri->ri_font->firstchar;
- fr = (u_char *)ri->ri_font->data + uc * ri->ri_fontscale;
- fs = ri->ri_font->stride;
-
- while (height--) {
- rp[0] = stamp[(fr[0] >> 4) & 0xf];
- rp[1] = stamp[fr[0] & 0xf];
- rp[2] = stamp[(fr[1] >> 4) & 0xf];
- fr += fs;
- rp += rs;
- }
- }
-
- /* Do underline */
- if ((attr & 1) != 0) {
- rp -= ri->ri_stride << 1;
- rp[0] = rp[1] = rp[2] = stamp[15];
- }
-
- stamp_mutex--;
-
- return 0;
-}
-
-/*
- * Put a single character. This is for 16-pixel wide fonts.
- */
-int
-rasops2_putchar16(void *cookie, int row, int col, u_int uc, long attr)
-{
- struct rasops_info *ri;
- int height, fs, rs;
- u_char *fr, *rp;
-
- /* Can't risk remaking the stamp if it's already in use */
- if (stamp_mutex++) {
- stamp_mutex--;
- return rasops2_putchar(cookie, row, col, uc, attr);
- }
-
- ri = (struct rasops_info *)cookie;
-
-#ifdef RASOPS_CLIPPING
- /* Catches 'row < 0' case too */
- if ((unsigned)row >= (unsigned)ri->ri_rows) {
- stamp_mutex--;
- return 0;
- }
-
- if ((unsigned)col >= (unsigned)ri->ri_cols) {
- stamp_mutex--;
- return 0;
- }
-#endif
-
- rp = ri->ri_bits + row * ri->ri_yscale + col * ri->ri_xscale;
- height = ri->ri_font->fontheight;
- rs = ri->ri_stride;
-
- /* Recompute stamp? */
- if (attr != stamp_attr)
- rasops2_makestamp(ri, attr);
-
- if (uc == ' ') {
- int8_t c = stamp[0];
- while (height--) {
- *(int32_t *)rp = c;
- rp += rs;
- }
- } else {
- uc -= ri->ri_font->firstchar;
- fr = (u_char *)ri->ri_font->data + uc * ri->ri_fontscale;
- fs = ri->ri_font->stride;
-
- while (height--) {
- rp[0] = stamp[(fr[0] >> 4) & 0xf];
- rp[1] = stamp[fr[0] & 0xf];
- rp[2] = stamp[(fr[1] >> 4) & 0xf];
- rp[3] = stamp[fr[1] & 0xf];
- fr += fs;
- rp += rs;
- }
- }
-
- /* Do underline */
- if ((attr & 1) != 0)
- *(int32_t *)(rp - (ri->ri_stride << 1)) = stamp[15];
-
- stamp_mutex--;
-
- return 0;
-}
-#endif /* !RASOPS_SMALL */
-
-/*
- * Grab routines common to depths where (bpp < 8)
- */
-#define NAME(ident) rasops2_##ident
-#define PIXEL_SHIFT 1
-
-#include <dev/rasops/rasops_bitops.h>
