o spaces, tabs, spelling cleanup.

o remove unneeded headers.
o makes this to compile if RASOPS_SMALL is defined.
o makes rasops2 to compile.

10 files changed, 42 insertions, 73 deletions

diff --git a/sys/dev/rasops/files.rasops b/sys/dev/rasops/files.rasops
index e877ccf6eb5..c9887fdb371 100644
--- a/sys/dev/rasops/files.rasops
+++ b/sys/dev/rasops/files.rasops
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.rasops,v 1.1 2001/03/18 04:32:44 nate Exp $
+#	$OpenBSD: files.rasops,v 1.2 2002/05/28 22:10:03 fgsch 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
@@ -8,7 +8,7 @@ file dev/rasops/rasops.c ( (rasops_glue |
     rasops32) &
     (rasterconsole | wsdisplay)) needs-flag
 
-file dev/rasops/rasops_masks.c ((rasterconsole | wsdisplay) & 
+file dev/rasops/rasops_masks.c ((rasterconsole | wsdisplay) &
     (rasops1 | rasops2 | rasops4))
 file dev/rasops/rasops1.c ((rasterconsole | wsdisplay) & rasops1)
 file dev/rasops/rasops2.c ((rasterconsole | wsdisplay) & rasops2)
diff --git a/sys/dev/rasops/rasops.c b/sys/dev/rasops/rasops.c
index 97e936412bf..ee12668a18c 100644
--- a/sys/dev/rasops/rasops.c
+++ b/sys/dev/rasops/rasops.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: rasops.c,v 1.3 2002/05/02 19:21:48 matthieu Exp $ */
-/*	 $NetBSD: rasops.c,v 1.35 2001/02/02 06:01:01 marcus Exp $	*/
+/*	$OpenBSD: rasops.c,v 1.4 2002/05/28 22:10:03 fgsch Exp $	*/
+/*	$NetBSD: rasops.c,v 1.35 2001/02/02 06:01:01 marcus Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,17 +37,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-//__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.35 2001/02/02 06:01:01 marcus Exp $");
-
 #include "rasops_glue.h"
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 
-/* #include <machine/bswap.h> */
 #include <machine/endian.h>
 
 #include <dev/wscons/wsdisplayvar.h>
@@ -114,7 +109,7 @@ static void	rasops_do_cursor(struct rasops_info *);
 static void	rasops_init_devcmap(struct rasops_info *);
 
 /*
- * Initalize a 'rasops_info' descriptor.
+ * Initialize a 'rasops_info' descriptor.
  */
 int
 rasops_init(ri, wantrows, wantcols)
@@ -129,13 +124,13 @@ rasops_init(ri, wantrows, wantcols)
 
 		wsfont_init();
 
-		if (ri->ri_width > 80*12) 
+		if (ri->ri_width > 80*12)
 			/* High res screen, choose a big font */
 			cookie = wsfont_find(NULL, 12, 0, 0);
-		else 
+		else
 			/*  lower res, choose a 8 pixel wide font */
 			cookie = wsfont_find(NULL, 8, 0, 0);
-		
+
 		if (cookie <= 0)
 			cookie = wsfont_find(NULL, 0, 0, 0);
 
@@ -169,7 +164,7 @@ rasops_init(ri, wantrows, wantcols)
 
 	if (rasops_reconfig(ri, wantrows, wantcols))
 		return (-1);
- 
+
 	rasops_init_devcmap(ri);
 	return (0);
 }
@@ -240,7 +235,7 @@ rasops_reconfig(ri, wantrows, wantcols)
 	ri->ri_origbits = ri->ri_bits;
 
 	if ((ri->ri_flg & RI_CENTER) != 0) {
-		ri->ri_bits += (((ri->ri_width * bpp >> 3) - 
+		ri->ri_bits += (((ri->ri_width * bpp >> 3) -
 		    ri->ri_emustride) >> 1) & ~3;
 		ri->ri_bits += ((ri->ri_height - ri->ri_emuheight) >> 1) *
 		    ri->ri_stride;
diff --git a/sys/dev/rasops/rasops1.c b/sys/dev/rasops/rasops1.c
index 71f9b0f450f..1665750a3c9 100644
--- a/sys/dev/rasops/rasops1.c
+++ b/sys/dev/rasops/rasops1.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: rasops1.c,v 1.2 2002/03/14 01:27:02 millert Exp $ */
-/* 	$NetBSD: rasops1.c,v 1.11 2000/04/12 14:22:29 pk Exp $	*/
+/*	$OpenBSD: rasops1.c,v 1.3 2002/05/28 22:10:03 fgsch Exp $	*/
+/*	$NetBSD: rasops1.c,v 1.11 2000/04/12 14:22:29 pk Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,10 +37,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-//__KERNEL_RCSID(0, "$NetBSD: rasops1.c,v 1.11 2000/04/12 14:22:29 pk Exp $");
-
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
@@ -61,7 +57,7 @@ static void	rasops1_putchar16(void *, int, int col, u_int, long);
 #endif
 
 /*
- * Initalize rasops_info struct for this colordepth.
+ * Initialize rasops_info struct for this colordepth.
  */
 void
 rasops1_init(ri)
diff --git a/sys/dev/rasops/rasops15.c b/sys/dev/rasops/rasops15.c
index ce7851715bc..600b32b05d0 100644
--- a/sys/dev/rasops/rasops15.c
+++ b/sys/dev/rasops/rasops15.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: rasops15.c,v 1.2 2002/03/14 01:27:02 millert Exp $ */
-/* 	$NetBSD: rasops15.c,v 1.7 2000/04/12 14:22:29 pk Exp $	*/
+/*	$OpenBSD: rasops15.c,v 1.3 2002/05/28 22:10:03 fgsch Exp $	*/
+/*	$NetBSD: rasops15.c,v 1.7 2000/04/12 14:22:29 pk Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,10 +37,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-//__KERNEL_RCSID(0, "$NetBSD: rasops15.c,v 1.7 2000/04/12 14:22:29 pk Exp $");
-
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
@@ -55,7 +51,6 @@ static void 	rasops15_putchar8(void *, int, int, u_int, long attr);
 static void 	rasops15_putchar12(void *, int, int, u_int, long attr);
 static void 	rasops15_putchar16(void *, int, int, u_int, long attr);
 static void	rasops15_makestamp(struct rasops_info *, long);
-#endif
 
 /*
  * (2x2)x1 stamp for optimized character blitting
@@ -63,6 +58,7 @@ static void	rasops15_makestamp(struct rasops_info *, long);
 static int32_t	stamp[32];
 static long	stamp_attr;
 static int	stamp_mutex;	/* XXX see note in readme */
+#endif
 
 /*
  * XXX this confuses the hell out of gcc2 (not egcs) which always insists
@@ -77,7 +73,7 @@ static int	stamp_mutex;	/* XXX see note in readme */
 #define STAMP_READ(o)		(*(int32_t *)((caddr_t)stamp + (o)))
 
 /*
- * Initalize rasops_info struct for this colordepth.
+ * Initialize rasops_info struct for this colordepth.
  */
 void
 rasops15_init(ri)
diff --git a/sys/dev/rasops/rasops2.c b/sys/dev/rasops/rasops2.c
index de3e37d8af7..69f52b98d12 100644
--- a/sys/dev/rasops/rasops2.c
+++ b/sys/dev/rasops/rasops2.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: rasops2.c,v 1.2 2002/03/14 01:27:02 millert Exp $ */
-/* 	$NetBSD: rasops2.c,v 1.5 2000/04/12 14:22:29 pk Exp $	*/
+/*	$OpenBSD: rasops2.c,v 1.3 2002/05/28 22:10:03 fgsch Exp $	*/
+/*	$NetBSD: rasops2.c,v 1.5 2000/04/12 14:22:29 pk Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,10 +37,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "opt_rasops.h"
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops2.c,v 1.5 2000/04/12 14:22:29 pk Exp $");
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -61,7 +57,6 @@ static void	rasops2_putchar8(void *, int, int col, u_int, long);
 static void	rasops2_putchar12(void *, int, int col, u_int, long);
 static void	rasops2_putchar16(void *, int, int col, u_int, long);
 static void	rasops2_makestamp(struct rasops_info *, long);
-#endif
 
 /*
  * 4x1 stamp for optimized character blitting
@@ -69,6 +64,7 @@ static void	rasops2_makestamp(struct rasops_info *, long);
 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.
diff --git a/sys/dev/rasops/rasops24.c b/sys/dev/rasops/rasops24.c
index 990cc8466db..3a658d4fbc8 100644
--- a/sys/dev/rasops/rasops24.c
+++ b/sys/dev/rasops/rasops24.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: rasops24.c,v 1.3 2002/05/28 15:16:32 fgsch Exp $ */
-/* 	$NetBSD: rasops24.c,v 1.12 2000/04/12 14:22:29 pk Exp $	*/
+/*	$OpenBSD: rasops24.c,v 1.4 2002/05/28 22:10:03 fgsch Exp $	*/
+/*	$NetBSD: rasops24.c,v 1.12 2000/04/12 14:22:29 pk Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,9 +37,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
@@ -58,7 +55,6 @@ static void 	rasops24_putchar8(void *, int, int, u_int, long attr);
 static void 	rasops24_putchar12(void *, int, int, u_int, long attr);
 static void 	rasops24_putchar16(void *, int, int, u_int, long attr);
 static void	rasops24_makestamp(struct rasops_info *, long);
-#endif
 
 /*
  * 4x1 stamp for optimized character blitting
@@ -66,6 +62,7 @@ static void	rasops24_makestamp(struct rasops_info *, long);
 static int32_t	stamp[64];
 static long	stamp_attr;
 static int	stamp_mutex;	/* XXX see note in readme */
+#endif
 
 /*
  * XXX this confuses the hell out of gcc2 (not egcs) which always insists
@@ -81,7 +78,7 @@ static int	stamp_mutex;	/* XXX see note in readme */
 #define STAMP_READ(o)		(*(int32_t *)((caddr_t)stamp + (o)))
 
 /*
- * Initalize rasops_info struct for this colordepth.
+ * Initialize rasops_info struct for this colordepth.
  */
 void
 rasops24_init(ri)
@@ -373,7 +370,7 @@ rasops24_putchar12(cookie, row, col, uc, attr)
 	if (uc == (u_int)-1) {
 		int32_t c = stamp[0];
 		while (height--) {
-			rp[0] = rp[1] = rp[2] = rp[3] = 
+			rp[0] = rp[1] = rp[2] = rp[3] =
 			rp[4] = rp[5] = rp[6] = rp[7] = rp[8] = c;
 			DELTA(rp, ri->ri_stride, int32_t *);
 		}
@@ -461,8 +458,8 @@ rasops24_putchar16(cookie, row, col, uc, attr)
 	if (uc == (u_int)-1) {
 		int32_t c = stamp[0];
 		while (height--) {
-			rp[0] = rp[1] = rp[2] = rp[3] = 
-			rp[4] = rp[5] = rp[6] = rp[7] = 
+			rp[0] = rp[1] = rp[2] = rp[3] =
+			rp[4] = rp[5] = rp[6] = rp[7] =
 			rp[8] = rp[9] = rp[10] = rp[11] = c;
 			DELTA(rp, ri->ri_stride, int32_t *);
 		}
@@ -502,8 +499,8 @@ rasops24_putchar16(cookie, row, col, uc, attr)
 		int32_t c = STAMP_READ(52);
 
 		DELTA(rp, -(ri->ri_stride << 1), int32_t *);
-		rp[0] = rp[1] = rp[2] = rp[3] = 
-		rp[4] = rp[5] = rp[6] = rp[7] = 
+		rp[0] = rp[1] = rp[2] = rp[3] =
+		rp[4] = rp[5] = rp[6] = rp[7] =
 		rp[8] = rp[9] = rp[10] = rp[11] = c;
 	}
 
diff --git a/sys/dev/rasops/rasops32.c b/sys/dev/rasops/rasops32.c
index 7f79183574a..01659d6595a 100644
--- a/sys/dev/rasops/rasops32.c
+++ b/sys/dev/rasops/rasops32.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: rasops32.c,v 1.2 2002/03/14 01:27:02 millert Exp $ */
-/*	 $NetBSD: rasops32.c,v 1.7 2000/04/12 14:22:29 pk Exp $	*/
+/*	$OpenBSD: rasops32.c,v 1.3 2002/05/28 22:10:03 fgsch Exp $	*/
+/*	$NetBSD: rasops32.c,v 1.7 2000/04/12 14:22:29 pk Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,10 +37,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-//__KERNEL_RCSID(0, "$NetBSD: rasops32.c,v 1.7 2000/04/12 14:22:29 pk Exp $");
-
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
@@ -49,10 +45,10 @@
 #include <dev/wscons/wsconsio.h>
 #include <dev/rasops/rasops.h>
 
-static void 	rasops32_putchar(void *, int, int, u_int, long attr);
+static void 	rasops32_putchar(void *, int, int, u_int, long);
 
 /*
- * Initalize a 'rasops_info' descriptor for this depth.
+ * Initialize a 'rasops_info' descriptor for this depth.
  */
 void
 rasops32_init(ri)
diff --git a/sys/dev/rasops/rasops4.c b/sys/dev/rasops/rasops4.c
index d2ea8d88c63..0e924cf8059 100644
--- a/sys/dev/rasops/rasops4.c
+++ b/sys/dev/rasops/rasops4.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: rasops4.c,v 1.2 2002/03/14 01:27:02 millert Exp $ */
-/* 	$NetBSD: $	*/
+/*	$OpenBSD: rasops4.c,v 1.3 2002/05/28 22:10:03 fgsch Exp $	*/
+/*	$NetBSD: rasops4.c,v 1.4 2001/11/15 09:48:15 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,10 +37,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-//__KERNEL_RCSID(0, "$NetBSD: $");
-
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
@@ -60,7 +56,6 @@ static void	rasops4_putchar8(void *, int, int col, u_int, long);
 static void	rasops4_putchar12(void *, int, int col, u_int, long);
 static void	rasops4_putchar16(void *, int, int col, u_int, long);
 static void	rasops4_makestamp(struct rasops_info *, long);
-#endif
 
 /*
  * 4x1 stamp for optimized character blitting
@@ -68,6 +63,7 @@ static void	rasops4_makestamp(struct rasops_info *, long);
 static u_int16_t	stamp[16];
 static long	stamp_attr;
 static int	stamp_mutex;	/* XXX see note in README */
+#endif
 
 /*
  * Initialize rasops_info struct for this colordepth.
diff --git a/sys/dev/rasops/rasops8.c b/sys/dev/rasops/rasops8.c
index 6c18de2d98d..3441eee0027 100644
--- a/sys/dev/rasops/rasops8.c
+++ b/sys/dev/rasops/rasops8.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: rasops8.c,v 1.2 2002/03/14 01:27:02 millert Exp $ */
-/* 	$NetBSD: rasops8.c,v 1.8 2000/04/12 14:22:29 pk Exp $	*/
+/*	$OpenBSD: rasops8.c,v 1.3 2002/05/28 22:10:03 fgsch Exp $	*/
+/*	$NetBSD: rasops8.c,v 1.8 2000/04/12 14:22:29 pk Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,9 +37,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-//__KERNEL_RCSID(0, "$NetBSD: rasops8.c,v 1.8 2000/04/12 14:22:29 pk Exp $");
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -55,7 +52,6 @@ static void 	rasops8_putchar8(void *, int, int, u_int, long attr);
 static void 	rasops8_putchar12(void *, int, int, u_int, long attr);
 static void 	rasops8_putchar16(void *, int, int, u_int, long attr);
 static void	rasops8_makestamp(struct rasops_info *ri, long);
-#endif
 
 /*
  * 4x1 stamp for optimized character blitting
@@ -63,6 +59,7 @@ static void	rasops8_makestamp(struct rasops_info *ri, long);
 static int32_t	stamp[16];
 static long	stamp_attr;
 static int	stamp_mutex;	/* XXX see note in README */
+#endif
 
 /*
  * XXX this confuses the hell out of gcc2 (not egcs) which always insists
@@ -76,7 +73,7 @@ static int	stamp_mutex;	/* XXX see note in README */
 #define STAMP_READ(o)		(*(int32_t *)((caddr_t)stamp + (o)))
 
 /*
- * Initalize a 'rasops_info' descriptor for this depth.
+ * Initialize a 'rasops_info' descriptor for this depth.
  */
 void
 rasops8_init(ri)
diff --git a/sys/dev/rasops/rasops_masks.c b/sys/dev/rasops/rasops_masks.c
index aec4eac218b..6e63fe6c789 100644
--- a/sys/dev/rasops/rasops_masks.c
+++ b/sys/dev/rasops/rasops_masks.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: rasops_masks.c,v 1.1 2001/03/18 04:32:45 nate Exp $ */
-/* 	$NetBSD: rasops_masks.c,v 1.5 2000/06/13 13:37:00 ad Exp $	*/
+/*	$OpenBSD: rasops_masks.c,v 1.2 2002/05/28 22:10:03 fgsch Exp $	*/
+/*	$NetBSD: rasops_masks.c,v 1.5 2000/06/13 13:37:00 ad Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.