Remove rasops2 (2-bit color depth) functions, they are unused.

It seems unlikely that any future new platform will ever need them.

OK mpi@

5 files changed, 8 insertions, 487 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 400bdbb7620..f201a01e488 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.635 2016/11/30 14:26:12 stsp Exp $
+#	$OpenBSD: files,v 1.636 2016/12/15 19:18:41 fcambus Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -41,7 +41,6 @@ attach	midi at midibus
 
 # raster operations attributes
 define	rasops1
-define	rasops2
 define	rasops4
 define	rasops8
 define	rasops15
diff --git a/sys/dev/rasops/files.rasops b/sys/dev/rasops/files.rasops
index 7bd131d8c3d..3b286ce22cc 100644
--- a/sys/dev/rasops/files.rasops
+++ b/sys/dev/rasops/files.rasops
@@ -1,16 +1,15 @@
-#	$OpenBSD: files.rasops,v 1.6 2006/12/02 15:55:18 miod Exp $
+#	$OpenBSD: files.rasops,v 1.7 2016/12/15 19:18:41 fcambus Exp $
 # 	$NetBSD: files.rasops,v 1.7 2001/01/21 13:50:59 takemura Exp $
 
 # 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)
diff --git a/sys/dev/rasops/rasops.c b/sys/dev/rasops/rasops.c
index 1f1072e3c81..9a38ab78e52 100644
--- a/sys/dev/rasops/rasops.c
+++ b/sys/dev/rasops/rasops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rasops.c,v 1.43 2016/09/26 20:41:08 fcambus Exp $	*/
+/*	$OpenBSD: rasops.c,v 1.44 2016/12/15 19:18:41 fcambus Exp $	*/
 /*	$NetBSD: rasops.c,v 1.35 2001/02/02 06:01:01 marcus Exp $	*/
 
 /*-
@@ -427,11 +427,6 @@ rasops_reconfig(struct rasops_info *ri, int wantrows, int wantcols)
 		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 *ri)
 	}
 
 	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++) {
diff --git a/sys/dev/rasops/rasops.h b/sys/dev/rasops/rasops.h
index 60d386fb254..71302e93f4f 100644
--- a/sys/dev/rasops/rasops.h
+++ b/sys/dev/rasops/rasops.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rasops.h,v 1.17 2015/09/07 18:00:58 kettenis Exp $ */
+/*	$OpenBSD: rasops.h,v 1.18 2016/12/15 19:18:41 fcambus Exp $ */
 /* 	$NetBSD: rasops.h,v 1.13 2000/06/13 13:36:54 ad Exp $ */
 
 /*-
@@ -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 *);
diff --git a/sys/dev/rasops/rasops2.c b/sys/dev/rasops/rasops2.c
deleted file mode 100644
index 904d5301f17..00000000000
--- a/sys/dev/rasops/rasops2.c
+++ /dev/null
@@ -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>