From 6a7edf0b568d44816d5f6c6ca1b8c64d8747b117 Mon Sep 17 00:00:00 2001
From: pk <pk@NetBSD.org>
Date: Wed, 4 Oct 1995 23:57:17 +0000
Subject: [PATCH] Move font defs back into machine-dependent area (per Jonathan
 Stone). Integrate patches from der Mouse (8-bit cleanliness, FULLSCREEN
 option, SMALLFONT option). The (MD) caller of rcons_init() is now responsible
 for initialising `rc_font'.

---
 sys/dev/rcons/gallant19.h                    | 1010 ------------------
 sys/dev/rcons/raster.h                       |    8 +-
 sys/dev/rcons/raster_text.c                  |    8 +-
 sys/dev/rcons/rcons.h                        |    4 +-
 sys/dev/rcons/rcons_kern.c                   |   26 +-
 sys/dev/rcons/rcons_subr.c                   |   26 +-
 sys/dev/rcons/{rcons_font.c => rcons_subr.h} |   43 +-
 7 files changed, 51 insertions(+), 1074 deletions(-)
 delete mode 100644 sys/dev/rcons/gallant19.h
 rename sys/dev/rcons/{rcons_font.c => rcons_subr.h} (69%)

diff --git a/sys/dev/rcons/gallant19.h b/sys/dev/rcons/gallant19.h
deleted file mode 100644
index 80fce287b411..000000000000
--- a/sys/dev/rcons/gallant19.h
+++ /dev/null
@@ -1,1010 +0,0 @@
-/*	$NetBSD: gallant19.h,v 1.1 1995/09/17 19:56:30 pk Exp $ */
-
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to the Computer Systems
- * Engineering Group at Lawrence Berkeley Laboratory and to the University
- * of California at Berkeley by Jef Poskanzer.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	@(#)gallant19.h	8.1 (Berkeley) 6/11/93
- */
-
-static u_long gallant19_32_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x000018c0, 0x000003c0, 0x000030c0,
-    0x000030c0, 0x00001ee0, 0x00000000, 0x00000000, 0x00002000, 0x0000e000,
-    0x00006000, 0x00006fc0, 0x00006060, 0x00006060, 0x00007060, 0x00004f80,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_32 = { 12, 22, 1, 1, gallant19_32_pixels, 0 };
-
-static u_long gallant19_33_pixels[] = {
-    0x00000000,
-    0x06000000, 0x06000000, 0x06000060, 0x06000060, 0x06000060, 0x060031e0,
-    0x06006060, 0x06006060, 0x060070e0, 0x06001e70, 0x06000000, 0x00000000,
-    0x00000000, 0x06000000, 0x06000000, 0x000030c0, 0x00006060, 0x00006000,
-    0x00003000, 0x00000f80, 0x00000000
-};
-static struct raster gallant19_33 = { 12, 22, 1, 1, gallant19_33_pixels, 0 };
-
-static u_long gallant19_34_pixels[] = {
-    0x00000000,
-    0x19800c00, 0x19801e00, 0x19800000, 0x19800000, 0x19800000, 0x19800000,
-    0x00000000, 0x000031e0, 0x000060c0, 0x00003180, 0x00006000, 0x00003fe0,
-    0x00004020, 0x00007fc0, 0x00001000, 0x00007000, 0x00003000, 0x000039c0,
-    0x000030c0, 0x000030c0, 0x00000000
-};
-static struct raster gallant19_34 = { 12, 22, 1, 1, gallant19_34_pixels, 0 };
-
-static u_long gallant19_35_pixels[] = {
-    0x00000000,
-    0x03300600, 0x03300600, 0x03300600, 0x06601f80, 0x1ff00000, 0x1ff00000,
-    0x0cc00000, 0x0cc000c0, 0x19800000, 0x198000c0, 0x7fc000c0, 0x7fc000c0,
-    0x330000c0, 0x660000c0, 0x660030c0, 0x00001f00, 0x00006000, 0x00006000,
-    0x00006000, 0x00006300, 0x00000000
-};
-static struct raster gallant19_35 = { 12, 22, 1, 1, gallant19_35_pixels, 0 };
-
-static u_long gallant19_36_pixels[] = {
-    0x00000000,
-    0x06000600, 0x1f800600, 0x3fc00600, 0x66e00600, 0x66600600, 0x66001f80,
-    0x3e000000, 0x1f800000, 0x07c00000, 0x06600000, 0x06600000, 0x66606ee0,
-    0x7fc06660, 0x3f806660, 0x06006660, 0x0000ef70, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_36 = { 12, 22, 1, 1, gallant19_36_pixels, 0 };
-
-static u_long gallant19_37_pixels[] = {
-    0x00000000,
-    0x38600000, 0x44c00000, 0x44c00000, 0x458011c0, 0x39806060, 0x03006060,
-    0x03007040, 0x06001f00, 0x0c000000, 0x0c000000, 0x19c00000, 0x1a200000,
-    0x32200000, 0x322071c0, 0x61c06060, 0x00006060, 0x00006040, 0x00007f00,
-    0x00006000, 0x00006000, 0x00000000
-};
-static struct raster gallant19_37 = { 12, 22, 1, 1, gallant19_37_pixels, 0 };
-
-static u_long gallant19_38_pixels[] = {
-    0x00000000,
-    0x07000060, 0x0f800060, 0x18c00000, 0x18c00000, 0x18c00000, 0x0f8034c0,
-    0x1e003000, 0x3e003000, 0x77003000, 0x63607800, 0x61e00000, 0x61c00000,
-    0x61800000, 0x3fe00000, 0x1e600000, 0x000030c0, 0x00003800, 0x00000780,
-    0x000020c0, 0x00003f80, 0x00000000
-};
-static struct raster gallant19_38 = { 12, 22, 1, 1, gallant19_38_pixels, 0 };
-
-static u_long gallant19_39_pixels[] = {
-    0x00000000,
-    0x0c000c20, 0x1e000780, 0x1e000000, 0x06000000, 0x06000000, 0x0c000000,
-    0x18000000, 0x100030c0, 0x000030c0, 0x000030c0, 0x000030c0, 0x00001e60,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00006020,
-    0x00003040, 0x00001880, 0x00000000
-};
-static struct raster gallant19_39 = { 12, 22, 1, 1, gallant19_39_pixels, 0 };
-
-static u_long gallant19_40_pixels[] = {
-    0x00000000,
-    0x00c06620, 0x01803b40, 0x03801980, 0x03001980, 0x07000000, 0x06000000,
-    0x06000000, 0x06000000, 0x06000000, 0x06007040, 0x07001d00, 0x03000700,
-    0x038011c0, 0x0180f1f0, 0x00c00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00006020, 0x00000000
-};
-static struct raster gallant19_40 = { 12, 22, 1, 1, gallant19_40_pixels, 0 };
-
-static u_long gallant19_41_pixels[] = {
-    0x00000000,
-    0x30000000, 0x180060e0, 0x1c000380, 0x0c000e00, 0x0e003820, 0x06007fe0,
-    0x06000000, 0x06000000, 0x060001c0, 0x06000300, 0x0e000180, 0x0c000300,
-    0x1c000300, 0x18000180, 0x30000300, 0x000001c0, 0x00000000, 0x00000000,
-    0x00000600, 0x00000600, 0x00000000
-};
-static struct raster gallant19_41 = { 12, 22, 1, 1, gallant19_41_pixels, 0 };
-
-static u_long gallant19_42_pixels[] = {
-    0x00000000,
-    0x00003800, 0x00000c00, 0x00001800, 0x00000c00, 0x0f000c00, 0x06001800,
-    0x66600c00, 0x76e03800, 0x19800000, 0x00000000, 0x19800000, 0x76e00000,
-    0x66600000, 0x06000000, 0x0f001c20, 0x000036c0, 0x00004380, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_42 = { 12, 22, 1, 1, gallant19_42_pixels, 0 };
-
-static u_long gallant19_43_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x06000000,
-    0x06000000, 0x06000000, 0x06000000, 0x7fe00000, 0x7fe00000, 0x06000000,
-    0x06000000, 0x06000000, 0x06000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_43 = { 12, 22, 1, 1, gallant19_43_pixels, 0 };
-
-static u_long gallant19_44_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x0c000000, 0x1e000000, 0x1e000000, 0x06000000, 0x06000000, 0x0c000000,
-    0x18000000, 0x10000000, 0x00000000
-};
-static struct raster gallant19_44 = { 12, 22, 1, 1, gallant19_44_pixels, 0 };
-
-static u_long gallant19_45_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x7fe00000, 0x7fe00000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_45 = { 12, 22, 1, 1, gallant19_45_pixels, 0 };
-
-static u_long gallant19_46_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0c000000,
-    0x1e000000, 0x1e000000, 0x0c000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_46 = { 12, 22, 1, 1, gallant19_46_pixels, 0 };
-
-static u_long gallant19_47_pixels[] = {
-    0x00000000,
-    0x00600000, 0x00c00000, 0x00c00000, 0x01800000, 0x01800000, 0x03000000,
-    0x03000000, 0x06000000, 0x0c000000, 0x0c000000, 0x18000000, 0x18000000,
-    0x30000000, 0x30000000, 0x60000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_47 = { 12, 22, 1, 1, gallant19_47_pixels, 0 };
-
-static u_long gallant19_48_pixels[] = {
-    0x00000000,
-    0x07000000, 0x0f800000, 0x11800000, 0x10c00000, 0x30c00000, 0x30c00000,
-    0x30c00000, 0x30c00000, 0x30c00000, 0x30c00000, 0x30c00000, 0x30800000,
-    0x18800000, 0x1f000000, 0x0e000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_48 = { 12, 22, 1, 1, gallant19_48_pixels, 0 };
-
-static u_long gallant19_49_pixels[] = {
-    0x00000000,
-    0x02000000, 0x06000000, 0x0e000000, 0x1e000000, 0x36000000, 0x06000000,
-    0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000,
-    0x06000000, 0x06000000, 0x3fc00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_49 = { 12, 22, 1, 1, gallant19_49_pixels, 0 };
-
-static u_long gallant19_50_pixels[] = {
-    0x00000000,
-    0x1f000000, 0x3f800000, 0x61c00000, 0x40c00000, 0x00c00000, 0x00c00000,
-    0x00c00000, 0x01800000, 0x03000000, 0x06000000, 0x0c000000, 0x18000000,
-    0x30200000, 0x7fe00000, 0x7fe00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_50 = { 12, 22, 1, 1, gallant19_50_pixels, 0 };
-
-static u_long gallant19_51_pixels[] = {
-    0x00000000,
-    0x0f800000, 0x1fc00000, 0x20e00000, 0x40600000, 0x00600000, 0x00e00000,
-    0x07c00000, 0x0fc00000, 0x00e00000, 0x00600000, 0x00600000, 0x40600000,
-    0x60400000, 0x3f800000, 0x1f000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_51 = { 12, 22, 1, 1, gallant19_51_pixels, 0 };
-
-static u_long gallant19_52_pixels[] = {
-    0x00000000,
-    0x01800000, 0x03800000, 0x03800000, 0x05800000, 0x05800000, 0x09800000,
-    0x09800000, 0x11800000, 0x11800000, 0x21800000, 0x3fe00000, 0x7fe00000,
-    0x01800000, 0x01800000, 0x01800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_52 = { 12, 22, 1, 1, gallant19_52_pixels, 0 };
-
-static u_long gallant19_53_pixels[] = {
-    0x00000000,
-    0x0fc00000, 0x0fc00000, 0x10000000, 0x10000000, 0x20000000, 0x3f800000,
-    0x31c00000, 0x00e00000, 0x00600000, 0x00600000, 0x00600000, 0x40600000,
-    0x60600000, 0x30c00000, 0x1f800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_53 = { 12, 22, 1, 1, gallant19_53_pixels, 0 };
-
-static u_long gallant19_54_pixels[] = {
-    0x00000000,
-    0x07000000, 0x0c000000, 0x18000000, 0x30000000, 0x30000000, 0x60000000,
-    0x67800000, 0x6fc00000, 0x70e00000, 0x60600000, 0x60600000, 0x60600000,
-    0x70400000, 0x3f800000, 0x1f000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_54 = { 12, 22, 1, 1, gallant19_54_pixels, 0 };
-
-static u_long gallant19_55_pixels[] = {
-    0x00000000,
-    0x1fe00000, 0x3fe00000, 0x60400000, 0x00400000, 0x00c00000, 0x00800000,
-    0x00800000, 0x01800000, 0x01000000, 0x01000000, 0x03000000, 0x02000000,
-    0x02000000, 0x06000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_55 = { 12, 22, 1, 1, gallant19_55_pixels, 0 };
-
-static u_long gallant19_56_pixels[] = {
-    0x00000000,
-    0x0f000000, 0x11800000, 0x30c00000, 0x30c00000, 0x30c00000, 0x18800000,
-    0x0d000000, 0x06000000, 0x0b000000, 0x11800000, 0x30c00000, 0x30c00000,
-    0x30c00000, 0x18800000, 0x0f000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_56 = { 12, 22, 1, 1, gallant19_56_pixels, 0 };
-
-static u_long gallant19_57_pixels[] = {
-    0x00000000,
-    0x0f800000, 0x11c00000, 0x20e00000, 0x60600000, 0x60600000, 0x60600000,
-    0x70e00000, 0x3f600000, 0x1e600000, 0x00600000, 0x00c00000, 0x00c00000,
-    0x01800000, 0x07000000, 0x3c000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_57 = { 12, 22, 1, 1, gallant19_57_pixels, 0 };
-
-static u_long gallant19_58_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0c000000,
-    0x1e000000, 0x1e000000, 0x0c000000, 0x00000000, 0x00000000, 0x0c000000,
-    0x1e000000, 0x1e000000, 0x0c000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_58 = { 12, 22, 1, 1, gallant19_58_pixels, 0 };
-
-static u_long gallant19_59_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x0c000000, 0x1e000000, 0x1e000000, 0x0c000000, 0x00000000, 0x00000000,
-    0x0c000000, 0x1e000000, 0x1e000000, 0x06000000, 0x06000000, 0x0c000000,
-    0x18000000, 0x10000000, 0x00000000
-};
-static struct raster gallant19_59 = { 12, 22, 1, 1, gallant19_59_pixels, 0 };
-
-static u_long gallant19_60_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00600000,
-    0x01c00000, 0x07000000, 0x1e000000, 0x78000000, 0x78000000, 0x1e000000,
-    0x07000000, 0x01c00000, 0x00600000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_60 = { 12, 22, 1, 1, gallant19_60_pixels, 0 };
-
-static u_long gallant19_61_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x7fc00000, 0x7fc00000, 0x00000000, 0x00000000, 0x7fc00000,
-    0x7fc00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_61 = { 12, 22, 1, 1, gallant19_61_pixels, 0 };
-
-static u_long gallant19_62_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x60000000,
-    0x38000000, 0x1e000000, 0x07800000, 0x01e00000, 0x01e00000, 0x07800000,
-    0x1e000000, 0x38000000, 0x60000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_62 = { 12, 22, 1, 1, gallant19_62_pixels, 0 };
-
-static u_long gallant19_63_pixels[] = {
-    0x00000000,
-    0x0f000000, 0x1f800000, 0x39c00000, 0x20c00000, 0x00c00000, 0x00c00000,
-    0x01800000, 0x03000000, 0x06000000, 0x0c000000, 0x0c000000, 0x00000000,
-    0x00000000, 0x0c000000, 0x0c000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_63 = { 12, 22, 1, 1, gallant19_63_pixels, 0 };
-
-static u_long gallant19_64_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x0f800000, 0x3fc00000, 0x30600000,
-    0x60600000, 0x67200000, 0x6fa00000, 0x6ca00000, 0x6ca00000, 0x67e00000,
-    0x60000000, 0x30000000, 0x3fe00000, 0x0fe00000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_64 = { 12, 22, 1, 1, gallant19_64_pixels, 0 };
-
-static u_long gallant19_65_pixels[] = {
-    0x00000000,
-    0x00000000, 0x06000000, 0x06000000, 0x0b000000, 0x0b000000, 0x09000000,
-    0x11800000, 0x11800000, 0x10800000, 0x3fc00000, 0x20c00000, 0x20400000,
-    0x40600000, 0x40600000, 0xe0f00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_65 = { 12, 22, 1, 1, gallant19_65_pixels, 0 };
-
-static u_long gallant19_66_pixels[] = {
-    0x00000000,
-    0x00000000, 0xff000000, 0x60800000, 0x60c00000, 0x60c00000, 0x60c00000,
-    0x61800000, 0x7f800000, 0x60c00000, 0x60600000, 0x60600000, 0x60600000,
-    0x60600000, 0x60c00000, 0xff800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_66 = { 12, 22, 1, 1, gallant19_66_pixels, 0 };
-
-static u_long gallant19_67_pixels[] = {
-    0x00000000,
-    0x00000000, 0x0fc00000, 0x10600000, 0x20200000, 0x20000000, 0x60000000,
-    0x60000000, 0x60000000, 0x60000000, 0x60000000, 0x60000000, 0x20000000,
-    0x30200000, 0x18400000, 0x0f800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_67 = { 12, 22, 1, 1, gallant19_67_pixels, 0 };
-
-static u_long gallant19_68_pixels[] = {
-    0x00000000,
-    0x00000000, 0xff000000, 0x61c00000, 0x60c00000, 0x60600000, 0x60600000,
-    0x60600000, 0x60600000, 0x60600000, 0x60600000, 0x60600000, 0x60600000,
-    0x60400000, 0x61800000, 0xfe000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_68 = { 12, 22, 1, 1, gallant19_68_pixels, 0 };
-
-static u_long gallant19_69_pixels[] = {
-    0x00000000,
-    0x00000000, 0x7fc00000, 0x30400000, 0x30400000, 0x30000000, 0x30000000,
-    0x30800000, 0x3f800000, 0x30800000, 0x30000000, 0x30000000, 0x30000000,
-    0x30200000, 0x30200000, 0x7fe00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_69 = { 12, 22, 1, 1, gallant19_69_pixels, 0 };
-
-static u_long gallant19_70_pixels[] = {
-    0x00000000,
-    0x00000000, 0x7fc00000, 0x30400000, 0x30400000, 0x30000000, 0x30000000,
-    0x30800000, 0x3f800000, 0x30800000, 0x30000000, 0x30000000, 0x30000000,
-    0x30000000, 0x30000000, 0x78000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_70 = { 12, 22, 1, 1, gallant19_70_pixels, 0 };
-
-static u_long gallant19_71_pixels[] = {
-    0x00000000,
-    0x00000000, 0x0fc00000, 0x10600000, 0x20200000, 0x20000000, 0x60000000,
-    0x60000000, 0x60000000, 0x60000000, 0x61f00000, 0x60600000, 0x20600000,
-    0x30600000, 0x18600000, 0x0f800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_71 = { 12, 22, 1, 1, gallant19_71_pixels, 0 };
-
-static u_long gallant19_72_pixels[] = {
-    0x00000000,
-    0x00000000, 0xf0f00000, 0x60600000, 0x60600000, 0x60600000, 0x60600000,
-    0x60600000, 0x7fe00000, 0x60600000, 0x60600000, 0x60600000, 0x60600000,
-    0x60600000, 0x60600000, 0xf0f00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_72 = { 12, 22, 1, 1, gallant19_72_pixels, 0 };
-
-static u_long gallant19_73_pixels[] = {
-    0x00000000,
-    0x00000000, 0x1f800000, 0x06000000, 0x06000000, 0x06000000, 0x06000000,
-    0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000,
-    0x06000000, 0x06000000, 0x1f800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_73 = { 12, 22, 1, 1, gallant19_73_pixels, 0 };
-
-static u_long gallant19_74_pixels[] = {
-    0x00000000,
-    0x00000000, 0x1f800000, 0x06000000, 0x06000000, 0x06000000, 0x06000000,
-    0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000,
-    0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x04000000,
-    0x38000000, 0x30000000, 0x00000000
-};
-static struct raster gallant19_74 = { 12, 22, 1, 1, gallant19_74_pixels, 0 };
-
-static u_long gallant19_75_pixels[] = {
-    0x00000000,
-    0x00000000, 0xf0e00000, 0x61800000, 0x63000000, 0x66000000, 0x6c000000,
-    0x78000000, 0x78000000, 0x7c000000, 0x6e000000, 0x67000000, 0x63800000,
-    0x61c00000, 0x60e00000, 0xf0700000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_75 = { 12, 22, 1, 1, gallant19_75_pixels, 0 };
-
-static u_long gallant19_76_pixels[] = {
-    0x00000000,
-    0x00000000, 0x78000000, 0x30000000, 0x30000000, 0x30000000, 0x30000000,
-    0x30000000, 0x30000000, 0x30000000, 0x30000000, 0x30000000, 0x30000000,
-    0x30200000, 0x30200000, 0x7fe00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_76 = { 12, 22, 1, 1, gallant19_76_pixels, 0 };
-
-static u_long gallant19_77_pixels[] = {
-    0x00000000,
-    0x00000000, 0xe0700000, 0x60e00000, 0x70e00000, 0x70e00000, 0x70e00000,
-    0x59600000, 0x59600000, 0x59600000, 0x4d600000, 0x4e600000, 0x4e600000,
-    0x44600000, 0x44600000, 0xe4f00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_77 = { 12, 22, 1, 1, gallant19_77_pixels, 0 };
-
-static u_long gallant19_78_pixels[] = {
-    0x00000000,
-    0x00000000, 0xc0700000, 0x60200000, 0x70200000, 0x78200000, 0x58200000,
-    0x4c200000, 0x46200000, 0x47200000, 0x43200000, 0x41a00000, 0x40e00000,
-    0x40e00000, 0x40600000, 0xe0300000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_78 = { 12, 22, 1, 1, gallant19_78_pixels, 0 };
-
-static u_long gallant19_79_pixels[] = {
-    0x00000000,
-    0x00000000, 0x0f000000, 0x11c00000, 0x20c00000, 0x20600000, 0x60600000,
-    0x60600000, 0x60600000, 0x60600000, 0x60600000, 0x60600000, 0x20400000,
-    0x30400000, 0x18800000, 0x0f000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_79 = { 12, 22, 1, 1, gallant19_79_pixels, 0 };
-
-static u_long gallant19_80_pixels[] = {
-    0x00000000,
-    0x00000000, 0x7f800000, 0x30c00000, 0x30600000, 0x30600000, 0x30600000,
-    0x30c00000, 0x37800000, 0x30000000, 0x30000000, 0x30000000, 0x30000000,
-    0x30000000, 0x30000000, 0x78000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_80 = { 12, 22, 1, 1, gallant19_80_pixels, 0 };
-
-static u_long gallant19_81_pixels[] = {
-    0x00000000,
-    0x00000000, 0x0f000000, 0x11c00000, 0x20c00000, 0x20600000, 0x60600000,
-    0x60600000, 0x60600000, 0x60600000, 0x60600000, 0x60600000, 0x30400000,
-    0x38400000, 0x1f800000, 0x0e000000, 0x1f000000, 0x23900000, 0x01e00000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_81 = { 12, 22, 1, 1, gallant19_81_pixels, 0 };
-
-static u_long gallant19_82_pixels[] = {
-    0x00000000,
-    0x00000000, 0xff000000, 0x61800000, 0x60c00000, 0x60c00000, 0x60c00000,
-    0x60800000, 0x7f000000, 0x7c000000, 0x6e000000, 0x67000000, 0x63800000,
-    0x61c00000, 0x60e00000, 0xf0700000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_82 = { 12, 22, 1, 1, gallant19_82_pixels, 0 };
-
-static u_long gallant19_83_pixels[] = {
-    0x00000000,
-    0x00000000, 0x1fe00000, 0x30600000, 0x60200000, 0x60200000, 0x70000000,
-    0x3c000000, 0x1e000000, 0x07800000, 0x01c00000, 0x00e00000, 0x40600000,
-    0x40600000, 0x60c00000, 0x7f800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_83 = { 12, 22, 1, 1, gallant19_83_pixels, 0 };
-
-static u_long gallant19_84_pixels[] = {
-    0x00000000,
-    0x00000000, 0x7fe00000, 0x46200000, 0x06000000, 0x06000000, 0x06000000,
-    0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000,
-    0x06000000, 0x06000000, 0x1f800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_84 = { 12, 22, 1, 1, gallant19_84_pixels, 0 };
-
-static u_long gallant19_85_pixels[] = {
-    0x00000000,
-    0x00000000, 0xf0700000, 0x60200000, 0x60200000, 0x60200000, 0x60200000,
-    0x60200000, 0x60200000, 0x60200000, 0x60200000, 0x60200000, 0x60200000,
-    0x70400000, 0x3fc00000, 0x1f800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_85 = { 12, 22, 1, 1, gallant19_85_pixels, 0 };
-
-static u_long gallant19_86_pixels[] = {
-    0x00000000,
-    0x00000000, 0xe0e00000, 0x60400000, 0x30800000, 0x30800000, 0x30800000,
-    0x19000000, 0x19000000, 0x19000000, 0x0c000000, 0x0e000000, 0x0e000000,
-    0x04000000, 0x04000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_86 = { 12, 22, 1, 1, gallant19_86_pixels, 0 };
-
-static u_long gallant19_87_pixels[] = {
-    0x00000000,
-    0x00000000, 0xfef00000, 0x66200000, 0x66200000, 0x66200000, 0x76200000,
-    0x77400000, 0x33400000, 0x37400000, 0x3bc00000, 0x3b800000, 0x19800000,
-    0x19800000, 0x19800000, 0x19800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_87 = { 12, 22, 1, 1, gallant19_87_pixels, 0 };
-
-static u_long gallant19_88_pixels[] = {
-    0x00000000,
-    0x00000000, 0xf0700000, 0x60200000, 0x30400000, 0x38800000, 0x18800000,
-    0x0d000000, 0x06000000, 0x06000000, 0x0b000000, 0x11800000, 0x11c00000,
-    0x20c00000, 0x40600000, 0xe0f00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_88 = { 12, 22, 1, 1, gallant19_88_pixels, 0 };
-
-static u_long gallant19_89_pixels[] = {
-    0x00000000,
-    0x00000000, 0xf0700000, 0x60200000, 0x30400000, 0x18800000, 0x18800000,
-    0x0d000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000,
-    0x06000000, 0x06000000, 0x0f000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_89 = { 12, 22, 1, 1, gallant19_89_pixels, 0 };
-
-static u_long gallant19_90_pixels[] = {
-    0x00000000,
-    0x00000000, 0x3fe00000, 0x20c00000, 0x00c00000, 0x01800000, 0x01800000,
-    0x03000000, 0x03000000, 0x06000000, 0x06000000, 0x0c000000, 0x0c000000,
-    0x18000000, 0x18200000, 0x3fe00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_90 = { 12, 22, 1, 1, gallant19_90_pixels, 0 };
-
-static u_long gallant19_91_pixels[] = {
-    0x00000000,
-    0x07c00000, 0x07c00000, 0x06000000, 0x06000000, 0x06000000, 0x06000000,
-    0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000,
-    0x06000000, 0x07c00000, 0x07c00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_91 = { 12, 22, 1, 1, gallant19_91_pixels, 0 };
-
-static u_long gallant19_92_pixels[] = {
-    0x00000000,
-    0x60000000, 0x60000000, 0x30000000, 0x30000000, 0x18000000, 0x18000000,
-    0x0c000000, 0x0c000000, 0x06000000, 0x03000000, 0x03000000, 0x01800000,
-    0x01800000, 0x00c00000, 0x00c00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_92 = { 12, 22, 1, 1, gallant19_92_pixels, 0 };
-
-static u_long gallant19_93_pixels[] = {
-    0x00000000,
-    0x7c000000, 0x7c000000, 0x0c000000, 0x0c000000, 0x0c000000, 0x0c000000,
-    0x0c000000, 0x0c000000, 0x0c000000, 0x0c000000, 0x0c000000, 0x0c000000,
-    0x0c000000, 0x7c000000, 0x7c000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_93 = { 12, 22, 1, 1, gallant19_93_pixels, 0 };
-
-static u_long gallant19_94_pixels[] = {
-    0x00000000,
-    0x04000000, 0x0e000000, 0x1b000000, 0x31800000, 0x60c00000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_94 = { 12, 22, 1, 1, gallant19_94_pixels, 0 };
-
-static u_long gallant19_95_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xfff00000, 0xfff00000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_95 = { 12, 22, 1, 1, gallant19_95_pixels, 0 };
-
-static u_long gallant19_96_pixels[] = {
-    0x00000000,
-    0x01000000, 0x03000000, 0x06000000, 0x06000000, 0x07800000, 0x07800000,
-    0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_96 = { 12, 22, 1, 1, gallant19_96_pixels, 0 };
-
-static u_long gallant19_97_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0f800000,
-    0x18c00000, 0x10c00000, 0x03c00000, 0x1cc00000, 0x30c00000, 0x30c00000,
-    0x30c00000, 0x39c00000, 0x1ee00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_97 = { 12, 22, 1, 1, gallant19_97_pixels, 0 };
-
-static u_long gallant19_98_pixels[] = {
-    0x00000000,
-    0x20000000, 0x60000000, 0xe0000000, 0x60000000, 0x60000000, 0x67800000,
-    0x6fc00000, 0x70e00000, 0x60600000, 0x60600000, 0x60600000, 0x60600000,
-    0x70600000, 0x78c00000, 0x4f800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_98 = { 12, 22, 1, 1, gallant19_98_pixels, 0 };
-
-static u_long gallant19_99_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x1f800000,
-    0x31c00000, 0x20c00000, 0x60000000, 0x60000000, 0x60000000, 0x60000000,
-    0x70400000, 0x30c00000, 0x1f800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_99 = { 12, 22, 1, 1, gallant19_99_pixels, 0 };
-
-static u_long gallant19_100_pixels[] = {
-    0x00000000,
-    0x00600000, 0x00e00000, 0x00600000, 0x00600000, 0x00600000, 0x0f600000,
-    0x31e00000, 0x20e00000, 0x60600000, 0x60600000, 0x60600000, 0x60600000,
-    0x70e00000, 0x39600000, 0x1e700000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_100 = { 12, 22, 1, 1, gallant19_100_pixels, 0 };
-
-static u_long gallant19_101_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0f000000,
-    0x30c00000, 0x60600000, 0x60600000, 0x7fe00000, 0x60000000, 0x60000000,
-    0x30000000, 0x18600000, 0x0f800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_101 = { 12, 22, 1, 1, gallant19_101_pixels, 0 };
-
-static u_long gallant19_102_pixels[] = {
-    0x00000000,
-    0x03800000, 0x04c00000, 0x04c00000, 0x0c000000, 0x0c000000, 0x0c000000,
-    0x0c000000, 0x1f800000, 0x0c000000, 0x0c000000, 0x0c000000, 0x0c000000,
-    0x0c000000, 0x0c000000, 0x1e000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_102 = { 12, 22, 1, 1, gallant19_102_pixels, 0 };
-
-static u_long gallant19_103_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x1f200000,
-    0x31e00000, 0x60c00000, 0x60c00000, 0x60c00000, 0x31800000, 0x3f000000,
-    0x60000000, 0x7fc00000, 0x3fe00000, 0x20600000, 0x40200000, 0x40200000,
-    0x7fc00000, 0x3f800000, 0x00000000
-};
-static struct raster gallant19_103 = { 12, 22, 1, 1, gallant19_103_pixels, 0 };
-
-static u_long gallant19_104_pixels[] = {
-    0x00000000,
-    0x10000000, 0x30000000, 0x70000000, 0x30000000, 0x30000000, 0x37800000,
-    0x39c00000, 0x30c00000, 0x30c00000, 0x30c00000, 0x30c00000, 0x30c00000,
-    0x30c00000, 0x30c00000, 0x79e00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_104 = { 12, 22, 1, 1, gallant19_104_pixels, 0 };
-
-static u_long gallant19_105_pixels[] = {
-    0x00000000,
-    0x00000000, 0x06000000, 0x06000000, 0x00000000, 0x00000000, 0x1e000000,
-    0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000,
-    0x06000000, 0x06000000, 0x1f800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_105 = { 12, 22, 1, 1, gallant19_105_pixels, 0 };
-
-static u_long gallant19_106_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00c00000, 0x00c00000, 0x00000000, 0x00000000, 0x03c00000,
-    0x00c00000, 0x00c00000, 0x00c00000, 0x00c00000, 0x00c00000, 0x00c00000,
-    0x00c00000, 0x00c00000, 0x00c00000, 0x20c00000, 0x30c00000, 0x38800000,
-    0x1f000000, 0x0e000000, 0x00000000
-};
-static struct raster gallant19_106 = { 12, 22, 1, 1, gallant19_106_pixels, 0 };
-
-static u_long gallant19_107_pixels[] = {
-    0x00000000,
-    0x60000000, 0xe0000000, 0x60000000, 0x60000000, 0x60000000, 0x61c00000,
-    0x63000000, 0x66000000, 0x7c000000, 0x78000000, 0x7c000000, 0x6e000000,
-    0x67000000, 0x63800000, 0xf1e00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_107 = { 12, 22, 1, 1, gallant19_107_pixels, 0 };
-
-static u_long gallant19_108_pixels[] = {
-    0x00000000,
-    0x1e000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000,
-    0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000,
-    0x06000000, 0x06000000, 0x1f800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_108 = { 12, 22, 1, 1, gallant19_108_pixels, 0 };
-
-static u_long gallant19_109_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xddc00000,
-    0x6ee00000, 0x66600000, 0x66600000, 0x66600000, 0x66600000, 0x66600000,
-    0x66600000, 0x66600000, 0xef700000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_109 = { 12, 22, 1, 1, gallant19_109_pixels, 0 };
-
-static u_long gallant19_110_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x27800000,
-    0x79c00000, 0x30c00000, 0x30c00000, 0x30c00000, 0x30c00000, 0x30c00000,
-    0x30c00000, 0x30c00000, 0x79e00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_110 = { 12, 22, 1, 1, gallant19_110_pixels, 0 };
-
-static u_long gallant19_111_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0f800000,
-    0x11c00000, 0x20e00000, 0x60600000, 0x60600000, 0x60600000, 0x60600000,
-    0x70400000, 0x38800000, 0x1f000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_111 = { 12, 22, 1, 1, gallant19_111_pixels, 0 };
-
-static u_long gallant19_112_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xef800000,
-    0x71c00000, 0x60e00000, 0x60600000, 0x60600000, 0x60600000, 0x60600000,
-    0x60400000, 0x70800000, 0x7f000000, 0x60000000, 0x60000000, 0x60000000,
-    0x60000000, 0xf0000000, 0x00000000
-};
-static struct raster gallant19_112 = { 12, 22, 1, 1, gallant19_112_pixels, 0 };
-
-static u_long gallant19_113_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0f200000,
-    0x11e00000, 0x20e00000, 0x60600000, 0x60600000, 0x60600000, 0x60600000,
-    0x70600000, 0x38e00000, 0x1fe00000, 0x00600000, 0x00600000, 0x00600000,
-    0x00600000, 0x00f00000, 0x00000000
-};
-static struct raster gallant19_113 = { 12, 22, 1, 1, gallant19_113_pixels, 0 };
-
-static u_long gallant19_114_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x73800000,
-    0x34c00000, 0x38c00000, 0x30000000, 0x30000000, 0x30000000, 0x30000000,
-    0x30000000, 0x30000000, 0x78000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_114 = { 12, 22, 1, 1, gallant19_114_pixels, 0 };
-
-static u_long gallant19_115_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x1fc00000,
-    0x30c00000, 0x30400000, 0x38000000, 0x1e000000, 0x07800000, 0x01c00000,
-    0x20c00000, 0x30c00000, 0x3f800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_115 = { 12, 22, 1, 1, gallant19_115_pixels, 0 };
-
-static u_long gallant19_116_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x04000000, 0x04000000, 0x0c000000, 0x7fc00000,
-    0x0c000000, 0x0c000000, 0x0c000000, 0x0c000000, 0x0c000000, 0x0c000000,
-    0x0c200000, 0x0e400000, 0x07800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_116 = { 12, 22, 1, 1, gallant19_116_pixels, 0 };
-
-static u_long gallant19_117_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x79e00000,
-    0x30c00000, 0x30c00000, 0x30c00000, 0x30c00000, 0x30c00000, 0x30c00000,
-    0x30c00000, 0x39c00000, 0x1e600000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_117 = { 12, 22, 1, 1, gallant19_117_pixels, 0 };
-
-static u_long gallant19_118_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf0700000,
-    0x60200000, 0x30400000, 0x30400000, 0x18800000, 0x18800000, 0x0d000000,
-    0x0d000000, 0x06000000, 0x06000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_118 = { 12, 22, 1, 1, gallant19_118_pixels, 0 };
-
-static u_long gallant19_119_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xff700000,
-    0x66200000, 0x66200000, 0x66200000, 0x37400000, 0x3b400000, 0x3b400000,
-    0x19800000, 0x19800000, 0x19800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_119 = { 12, 22, 1, 1, gallant19_119_pixels, 0 };
-
-static u_long gallant19_120_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf8f00000,
-    0x70400000, 0x38800000, 0x1d000000, 0x0e000000, 0x07000000, 0x0b800000,
-    0x11c00000, 0x20e00000, 0xf1f00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_120 = { 12, 22, 1, 1, gallant19_120_pixels, 0 };
-
-static u_long gallant19_121_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xf0f00000,
-    0x60200000, 0x30400000, 0x30400000, 0x18800000, 0x18800000, 0x0d000000,
-    0x0d000000, 0x06000000, 0x06000000, 0x04000000, 0x0c000000, 0x08000000,
-    0x78000000, 0x70000000, 0x00000000
-};
-static struct raster gallant19_121 = { 12, 22, 1, 1, gallant19_121_pixels, 0 };
-
-static u_long gallant19_122_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x7fe00000,
-    0x60e00000, 0x41c00000, 0x03800000, 0x07000000, 0x0e000000, 0x1c000000,
-    0x38200000, 0x70600000, 0x7fe00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_122 = { 12, 22, 1, 1, gallant19_122_pixels, 0 };
-
-static u_long gallant19_123_pixels[] = {
-    0x00000000,
-    0x01c00000, 0x03000000, 0x03000000, 0x01800000, 0x01800000, 0x01800000,
-    0x03000000, 0x07000000, 0x03000000, 0x01800000, 0x01800000, 0x01800000,
-    0x03000000, 0x03000000, 0x01c00000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_123 = { 12, 22, 1, 1, gallant19_123_pixels, 0 };
-
-static u_long gallant19_124_pixels[] = {
-    0x00000000,
-    0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000,
-    0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000,
-    0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000,
-    0x06000000, 0x06000000, 0x00000000
-};
-static struct raster gallant19_124 = { 12, 22, 1, 1, gallant19_124_pixels, 0 };
-
-static u_long gallant19_125_pixels[] = {
-    0x00000000,
-    0x38000000, 0x0c000000, 0x0c000000, 0x18000000, 0x18000000, 0x18000000,
-    0x0c000000, 0x0e000000, 0x0c000000, 0x18000000, 0x18000000, 0x18000000,
-    0x0c000000, 0x0c000000, 0x38000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_125 = { 12, 22, 1, 1, gallant19_125_pixels, 0 };
-
-static u_long gallant19_126_pixels[] = {
-    0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x1c200000, 0x3e600000, 0x36c00000, 0x67c00000,
-    0x43800000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000
-};
-static struct raster gallant19_126 = { 12, 22, 1, 1, gallant19_126_pixels, 0 };
-
-#define	null2 {0}, {0}
-#define	null4 null2, null2
-#define	null8 null4, null4
-#define	null16 null8, null8
-#define	null32 null16, null16
-#define	null64 null32, null32
-#define	null128 null64, null64
-
-struct raster_font gallant19 = {
-    12, 22, RASFONT_FIXEDWIDTH|RASFONT_NOVERTICALMOVEMENT,
-    {
-	null32,
-	{ &gallant19_32, 0, -15, 12, 0 },
-	{ &gallant19_33, 0, -15, 12, 0 },
-	{ &gallant19_34, 0, -15, 12, 0 },
-	{ &gallant19_35, 0, -15, 12, 0 },
-	{ &gallant19_36, 0, -15, 12, 0 },
-	{ &gallant19_37, 0, -15, 12, 0 },
-	{ &gallant19_38, 0, -15, 12, 0 },
-	{ &gallant19_39, 0, -15, 12, 0 },
-	{ &gallant19_40, 0, -15, 12, 0 },
-	{ &gallant19_41, 0, -15, 12, 0 },
-	{ &gallant19_42, 0, -15, 12, 0 },
-	{ &gallant19_43, 0, -15, 12, 0 },
-	{ &gallant19_44, 0, -15, 12, 0 },
-	{ &gallant19_45, 0, -15, 12, 0 },
-	{ &gallant19_46, 0, -15, 12, 0 },
-	{ &gallant19_47, 0, -15, 12, 0 },
-	{ &gallant19_48, 0, -15, 12, 0 },
-	{ &gallant19_49, 0, -15, 12, 0 },
-	{ &gallant19_50, 0, -15, 12, 0 },
-	{ &gallant19_51, 0, -15, 12, 0 },
-	{ &gallant19_52, 0, -15, 12, 0 },
-	{ &gallant19_53, 0, -15, 12, 0 },
-	{ &gallant19_54, 0, -15, 12, 0 },
-	{ &gallant19_55, 0, -15, 12, 0 },
-	{ &gallant19_56, 0, -15, 12, 0 },
-	{ &gallant19_57, 0, -15, 12, 0 },
-	{ &gallant19_58, 0, -15, 12, 0 },
-	{ &gallant19_59, 0, -15, 12, 0 },
-	{ &gallant19_60, 0, -15, 12, 0 },
-	{ &gallant19_61, 0, -15, 12, 0 },
-	{ &gallant19_62, 0, -15, 12, 0 },
-	{ &gallant19_63, 0, -15, 12, 0 },
-	{ &gallant19_64, 0, -15, 12, 0 },
-	{ &gallant19_65, 0, -15, 12, 0 },
-	{ &gallant19_66, 0, -15, 12, 0 },
-	{ &gallant19_67, 0, -15, 12, 0 },
-	{ &gallant19_68, 0, -15, 12, 0 },
-	{ &gallant19_69, 0, -15, 12, 0 },
-	{ &gallant19_70, 0, -15, 12, 0 },
-	{ &gallant19_71, 0, -15, 12, 0 },
-	{ &gallant19_72, 0, -15, 12, 0 },
-	{ &gallant19_73, 0, -15, 12, 0 },
-	{ &gallant19_74, 0, -15, 12, 0 },
-	{ &gallant19_75, 0, -15, 12, 0 },
-	{ &gallant19_76, 0, -15, 12, 0 },
-	{ &gallant19_77, 0, -15, 12, 0 },
-	{ &gallant19_78, 0, -15, 12, 0 },
-	{ &gallant19_79, 0, -15, 12, 0 },
-	{ &gallant19_80, 0, -15, 12, 0 },
-	{ &gallant19_81, 0, -15, 12, 0 },
-	{ &gallant19_82, 0, -15, 12, 0 },
-	{ &gallant19_83, 0, -15, 12, 0 },
-	{ &gallant19_84, 0, -15, 12, 0 },
-	{ &gallant19_85, 0, -15, 12, 0 },
-	{ &gallant19_86, 0, -15, 12, 0 },
-	{ &gallant19_87, 0, -15, 12, 0 },
-	{ &gallant19_88, 0, -15, 12, 0 },
-	{ &gallant19_89, 0, -15, 12, 0 },
-	{ &gallant19_90, 0, -15, 12, 0 },
-	{ &gallant19_91, 0, -15, 12, 0 },
-	{ &gallant19_92, 0, -15, 12, 0 },
-	{ &gallant19_93, 0, -15, 12, 0 },
-	{ &gallant19_94, 0, -15, 12, 0 },
-	{ &gallant19_95, 0, -15, 12, 0 },
-	{ &gallant19_96, 0, -15, 12, 0 },
-	{ &gallant19_97, 0, -15, 12, 0 },
-	{ &gallant19_98, 0, -15, 12, 0 },
-	{ &gallant19_99, 0, -15, 12, 0 },
-	{ &gallant19_100, 0, -15, 12, 0 },
-	{ &gallant19_101, 0, -15, 12, 0 },
-	{ &gallant19_102, 0, -15, 12, 0 },
-	{ &gallant19_103, 0, -15, 12, 0 },
-	{ &gallant19_104, 0, -15, 12, 0 },
-	{ &gallant19_105, 0, -15, 12, 0 },
-	{ &gallant19_106, 0, -15, 12, 0 },
-	{ &gallant19_107, 0, -15, 12, 0 },
-	{ &gallant19_108, 0, -15, 12, 0 },
-	{ &gallant19_109, 0, -15, 12, 0 },
-	{ &gallant19_110, 0, -15, 12, 0 },
-	{ &gallant19_111, 0, -15, 12, 0 },
-	{ &gallant19_112, 0, -15, 12, 0 },
-	{ &gallant19_113, 0, -15, 12, 0 },
-	{ &gallant19_114, 0, -15, 12, 0 },
-	{ &gallant19_115, 0, -15, 12, 0 },
-	{ &gallant19_116, 0, -15, 12, 0 },
-	{ &gallant19_117, 0, -15, 12, 0 },
-	{ &gallant19_118, 0, -15, 12, 0 },
-	{ &gallant19_119, 0, -15, 12, 0 },
-	{ &gallant19_120, 0, -15, 12, 0 },
-	{ &gallant19_121, 0, -15, 12, 0 },
-	{ &gallant19_122, 0, -15, 12, 0 },
-	{ &gallant19_123, 0, -15, 12, 0 },
-	{ &gallant19_124, 0, -15, 12, 0 },
-	{ &gallant19_125, 0, -15, 12, 0 },
-	{ &gallant19_126, 0, -15, 12, 0 },
-	{ 0 },
-	null128
-    },
-#ifdef COLORFONT_CACHE
-    (struct raster_fontcache*) -1
-#endif /*COLORFONT_CACHE*/
-};
diff --git a/sys/dev/rcons/raster.h b/sys/dev/rcons/raster.h
index 871f05d0dda2..77c7e262b245 100644
--- a/sys/dev/rcons/raster.h
+++ b/sys/dev/rcons/raster.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: raster.h,v 1.1 1995/09/17 19:56:32 pk Exp $ */
+/*	$NetBSD: raster.h,v 1.2 1995/10/04 23:57:19 pk Exp $ */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -115,7 +115,7 @@ struct raster_fontcache {
 
 /* Font struct. */
 struct raster_font {
-    int width, height;	/* nominal character size */
+    int width, height, ascent;	/* nominal character size */
     int flags;
 #define RASFONT_FIXEDWIDTH		0x1
 #define RASFONT_NOVERTICALMOVEMENT	0x2
@@ -212,10 +212,10 @@ extern int raster_replsrc ARGS(( struct raster* dst, int dx, int dy, int w, int
 extern struct raster_font* raster_fontopen ARGS(( char* fontname ));
 /* Opens a font. Returns (struct raster_font*) 0 on failure. */
 
-extern int raster_text ARGS(( struct raster* r, int x, int y, int rop, struct raster_font* rf, char* text ));
+extern int raster_text ARGS(( struct raster* r, int x, int y, int rop, struct raster_font* rf, unsigned char* text ));
 /* Draws text.  Returns 0 on success, -1 on failure. */
 
-extern int raster_textn ARGS(( struct raster* r, int x, int y, int rop, struct raster_font* rf, char* text, int len ));
+extern int raster_textn ARGS(( struct raster* r, int x, int y, int rop, struct raster_font* rf, unsigned char* text, int len ));
 /* Draws n characters of text.  Returns 0 on success, -1 on failure. */
 
 extern void raster_fontclose ARGS(( struct raster_font* rf ));
diff --git a/sys/dev/rcons/raster_text.c b/sys/dev/rcons/raster_text.c
index f0221682fb81..d77b1f69a1a0 100644
--- a/sys/dev/rcons/raster_text.c
+++ b/sys/dev/rcons/raster_text.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: raster_text.c,v 1.1 1995/09/17 19:56:35 pk Exp $ */
+/*	$NetBSD: raster_text.c,v 1.2 1995/10/04 23:57:22 pk Exp $ */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -67,7 +67,7 @@ raster_text( r, x, y, rop, rf, text )
     int x, y;
     int rop;
     struct raster_font* rf;
-    char* text;
+    unsigned char* text;
     {
     return raster_textn( r, x, y, rop, rf, text, strlen( text ) );
     }
@@ -79,7 +79,7 @@ raster_textn( r, x, y, rop, rf, text, n )
     int x, y;
     int rop;
     struct raster_font* rf;
-    char* text;
+    unsigned char* text;
     int n;
     {
     int clip;
@@ -87,7 +87,7 @@ raster_textn( r, x, y, rop, rf, text, n )
     struct raster_char* c;
     struct raster* charrast;
     int i;
-    register char ch;
+    register unsigned char ch;
     int thisx, thisy;
     int phase;
 
diff --git a/sys/dev/rcons/rcons.h b/sys/dev/rcons/rcons.h
index 24c78dfc4718..da6398d3fb53 100644
--- a/sys/dev/rcons/rcons.h
+++ b/sys/dev/rcons/rcons.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rcons.h,v 1.1 1995/09/17 19:56:36 pk Exp $ */
+/*	$NetBSD: rcons.h,v 1.2 1995/10/04 23:57:23 pk Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -44,6 +44,8 @@
  *	@(#)fbvar.h	8.1 (Berkeley) 6/11/93
  */
 
+#include <dev/rcons/raster.h>
+
 struct rconsole {
 	/* Raster console emulator state */
 
diff --git a/sys/dev/rcons/rcons_kern.c b/sys/dev/rcons/rcons_kern.c
index 18a399adbbb7..a2f5fe0ea876 100644
--- a/sys/dev/rcons/rcons_kern.c
+++ b/sys/dev/rcons/rcons_kern.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rcons_kern.c,v 1.1 1995/09/17 19:56:40 pk Exp $ */
+/*	$NetBSD: rcons_kern.c,v 1.2 1995/10/04 23:57:25 pk Exp $ */
 
 /*
  * Copyright (c) 1991, 1993
@@ -57,8 +57,7 @@ extern struct tty *fbconstty;
 
 static void rcons_belltmr(void *);
 
-extern void rcons_puts(struct rconsole *, char *, int);
-extern void rcons_font(struct rconsole *);
+#include "rcons_subr.h"
 
 static struct rconsole *mydevicep;
 
@@ -91,8 +90,6 @@ rcons_output(tp)
 	tp->t_state |= TS_BUSY;
 	splx(s);
 	n = q_to_b(&tp->t_outq, buf, sizeof(buf));
-	for (i = 0; i < n; ++i)
-		buf[i] &= 0177;		/* strip parity (argh) */
 	rcons_puts(mydevicep, buf, n);
 
 	s = spltty();
@@ -192,9 +189,6 @@ rcons_init(rc)
 
 	rc->rc_ras_blank = RAS_CLEAR;
 
-	/* Setup the static font */
-	rcons_font(rc);
-
 	/* Impose upper bounds on rc_max{row,col} */
 	i = rc->rc_height / rc->rc_font->height;
 	if (rc->rc_maxrow > i)
@@ -227,12 +221,24 @@ rcons_init(rc)
 	}
 	rc->rc_emuheight = rc->rc_maxrow * rc->rc_font->height;
 
+#ifdef RASTERCONS_WONB
+	rc->rc_ras_blank = RAS_NOT(rc->rc_ras_blank);
+	rc->rc_bits |= FB_INVERT;
+#endif
+
 	if (rc->rc_row == NULL || rc->rc_col == NULL) {
-		/* No address passed; use private copies */
+		/*
+		 * No address passed; use private copies
+		 * go to LL corner and scroll.
+		 */
 		rc->rc_row = &row;
 		rc->rc_col = &col;
-		row = col = 0;
+		row = rc->rc_maxrow;
+		col = 0;
+#if 0
 		rcons_clear2eop(rc);	/* clear the display */
+#endif
+		rcons_scroll(rc, 1);
 		rcons_cursor(rc);	/* and draw the initial cursor */
 	} else {
 		/* Prom emulator cursor is currently visible */
diff --git a/sys/dev/rcons/rcons_subr.c b/sys/dev/rcons/rcons_subr.c
index 07c02c063d18..dcc6cb984c05 100644
--- a/sys/dev/rcons/rcons_subr.c
+++ b/sys/dev/rcons/rcons_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rcons_subr.c,v 1.1 1995/09/17 19:56:41 pk Exp $ */
+/*	$NetBSD: rcons_subr.c,v 1.2 1995/10/04 23:57:26 pk Exp $ */
 
 /*
  * Copyright (c) 1991, 1993
@@ -55,34 +55,22 @@
 #include <dev/rcons/rcons.h>
 #include <dev/rcons/raster.h>
 
-void rcons_text(struct rconsole *, char *, int);
-void rcons_pctrl(struct rconsole *, int);
-void rcons_esc(struct rconsole *, int);
-void rcons_doesc(struct rconsole *, int);
-void rcons_cursor(struct rconsole *);
-void rcons_invert(struct rconsole *, int);
-void rcons_clear2eop(struct rconsole *);
-void rcons_clear2eol(struct rconsole *);
-void rcons_scroll(struct rconsole *, int);
-void rcons_delchar(struct rconsole *, int);
-void rcons_delline(struct rconsole *, int);
-void rcons_insertchar(struct rconsole *, int);
-void rcons_insertline(struct rconsole *, int);
+#include "rcons_subr.h"
 
 extern void rcons_bell(struct rconsole *);
 
-#define RCONS_ISPRINT(c) ((c) >= ' ' && (c) <= '~')
+#define RCONS_ISPRINT(c) ((((c) >= ' ') && ((c) <= '~')) || ((c) > 160))
 #define RCONS_ISDIGIT(c) ((c) >= '0' && (c) <= '9')
 
 /* Output (or at least handle) a string sent to the console */
 void
 rcons_puts(rc, str, n)
 	register struct rconsole *rc;
-	register char *str;
+	register unsigned char *str;
 	register int n;
 {
 	register int c, i, j;
-	register char *cp;
+	register unsigned char *cp;
 
 	/* Jump scroll */
 	/* XXX maybe this should be an option? */
@@ -150,14 +138,14 @@ rcons_puts(rc, str, n)
 void
 rcons_text(rc, str, n)
 	register struct rconsole *rc;
-	register char *str;
+	register unsigned char *str;
 	register int n;
 {
 	register int x, y, op;
 
 	x = *rc->rc_col * rc->rc_font->width + rc->rc_xorigin;
 	y = *rc->rc_row * rc->rc_font->height +
-	    rc->rc_font_ascent + rc->rc_yorigin;
+	    rc->rc_font->ascent + rc->rc_yorigin;
 	op = RAS_SRC;
 	if (((rc->rc_bits & FB_STANDOUT) != 0) ^
 	    ((rc->rc_bits & FB_INVERT) != 0))
diff --git a/sys/dev/rcons/rcons_font.c b/sys/dev/rcons/rcons_subr.h
similarity index 69%
rename from sys/dev/rcons/rcons_font.c
rename to sys/dev/rcons/rcons_subr.h
index 1df9242a3af1..f09371267728 100644
--- a/sys/dev/rcons/rcons_font.c
+++ b/sys/dev/rcons/rcons_subr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rcons_font.c,v 1.1 1995/09/17 19:56:38 pk Exp $ */
+/*	$NetBSD: rcons_subr.h,v 1.1 1995/10/04 23:57:28 pk Exp $ */
 
 /*
  * Copyright (c) 1991, 1993
@@ -41,30 +41,21 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)rcons_font.c	8.1 (Berkeley) 6/11/93
+ *	extracted from: @(#)rcons_subr.c	8.1 (Berkeley) 6/11/93
  */
 
-#ifdef _KERNEL
-#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/device.h>
-#else
-#include <sys/types.h>
-#include "myfbdevice.h"
-#endif
-
-#include <dev/rcons/raster.h>
-#include <dev/rcons/rcons.h>
-#include <dev/rcons/gallant19.h>
-
-void
-rcons_font(rc)
-	register struct rconsole *rc;
-{
-
-	/* XXX really rather get this from the prom */
-	rc->rc_font = &gallant19;
-
-	/* Get distance to top and bottom of font from font origin */
-	rc->rc_font_ascent = -(rc->rc_font->chars)['a'].homey;
-}
+extern void rcons_puts __P((struct rconsole *, unsigned char *, int));
+extern void rcons_font __P((struct rconsole *));
+extern void rcons_text __P((struct rconsole *, unsigned char *, int));
+extern void rcons_pctrl __P((struct rconsole *, int));
+extern void rcons_esc __P((struct rconsole *, int));
+extern void rcons_doesc __P((struct rconsole *, int));
+extern void rcons_cursor __P((struct rconsole *));
+extern void rcons_invert __P((struct rconsole *, int));
+extern void rcons_clear2eop __P((struct rconsole *));
+extern void rcons_clear2eol __P((struct rconsole *));
+extern void rcons_scroll __P((struct rconsole *, int));
+extern void rcons_delchar __P((struct rconsole *, int));
+extern void rcons_delline __P((struct rconsole *, int));
+extern void rcons_insertchar __P((struct rconsole *, int));
+extern void rcons_insertline __P((struct rconsole *, int));