 @@ -1,14 +1,14 @@
-/* $NetBSD: vga.c,v 1.106 2010/12/09 23:33:30 christos Exp $ */
+/* $NetBSD: vga.c,v 1.107 2011/06/08 10:25:21 drochner Exp $ */
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Chris G. Demetriou
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
 @@ -18,27 +18,27 @@
+ *
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.106 2010/12/09 23:33:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.107 2011/06/08 10:25:21 drochner Exp $");
 /* for WSCONS_SUPPORT_PCVTFONTS */
 #include "opt_wsdisplay_compat.h"
 /* for WSDISPLAY_CUSTOM_BORDER */
 #include "opt_wsdisplay_border.h"
 /* for WSDISPLAY_CUSTOM_OUTPUT */
 #include "opt_wsmsgattrs.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 @@ -301,27 +301,29 @@ const struct wsdisplay_accessops vga_acc
 	vga_scroll,
 #else
 	NULL,
 #endif
 };
 /*
  * We want at least ASCII 32..127 be present in the
  * first font slot.
  */
 #define vga_valid_primary_font(f) \
 	(f->wsfont->encoding == WSDISPLAY_FONTENC_IBM || \
 	f->wsfont->encoding == WSDISPLAY_FONTENC_ISO || \
-	f->wsfont->encoding == WSDISPLAY_FONTENC_ISO7)
+	f->wsfont->encoding == WSDISPLAY_FONTENC_ISO2 || \
 	f->wsfont->encoding == WSDISPLAY_FONTENC_ISO7 || \
 	f->wsfont->encoding == WSDISPLAY_FONTENC_KOI8_R)
 struct egavga_font *
 egavga_getfont(struct vga_config *vc, struct vgascreen *scr, const char *name,
 	       int primary)
+{
 	struct egavga_font *f;
 	int cookie;
 	struct wsdisplay_font *wf;
 	TAILQ_FOREACH(f, &vc->vc_fontlist, next) {
 		if (wsfont_matches(f->wsfont, name,
 , scr->pcs.type->fontheight, 0) &&
 		    (!primary || vga_valid_primary_font(f))) {
 @@ -1325,41 +1327,97 @@ vga_iso7_mapchar(int uni, u_int *index)
 		/* U+0384 is at offset 0xb4 in the font */
 		*index = uni - 0x0384 + 0xb4;
 		return (5);
+	}
 	/* XXX more chars in the iso-9 font */
 	*index = 0xa4; /* shaded rectangle */
 	return (0);
+}
 #endif /* WSCONS_SUPPORT_ISO7FONTS */
 static const uint16_t iso2_unichars[0x60] = {
 x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7,
 x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B,
 x00B0, 0x0105, 0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7,
 x00B8, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E, 0x017C,
 x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
 x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
 x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
 x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
 x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
 x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
 x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
 x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
 };
 static const uint16_t koi8_unichars[0x40] = {
 x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433,
 x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E,
 x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432,
 x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A,
 x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413,
 x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E,
 x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412,
 x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A
 };
 static int _vga_mapchar(void *, const struct egavga_font *, int, u_int *);
 static int
 _vga_mapchar(void *id, const struct egavga_font *font, int uni, u_int *index)
+{
 	switch (font->wsfont->encoding) {
 	case WSDISPLAY_FONTENC_ISO:
 		if (uni < 256) {
 			*index = uni;
 			return (5);
 		} else {
 			*index = ' ';
 			return (0);
+		}
 	case WSDISPLAY_FONTENC_ISO2:
 		if (uni < 0xa0) {
 			*index = uni;
 			return (5);
 		} else {
 			int i;
 			for (i = 0; i < 0x60; i++) {
 				if (uni == iso2_unichars[i]) {
 					*index = i + 0xa0;
 					return (5);
+				}
+			}
 			*index = 0xa4; /* currency sign */
 			return (0);
+		}
 	case WSDISPLAY_FONTENC_KOI8_R:
 		if (uni < 0x80) {
 			*index = uni;
 			return (5);
 		} else {
 			int i;
 			for (i = 0; i < 0x40; i++) {
 				if (uni == koi8_unichars[i]) {
 					*index = i + 0xc0;
 					return (5);
+				}
+			}
 			*index = 0x94; /* box */
 			return (0);
+		}
 	case WSDISPLAY_FONTENC_IBM:
 		return (pcdisplay_mapchar(id, uni, index));
 #ifdef WSCONS_SUPPORT_PCVTFONTS
 	case WSDISPLAY_FONTENC_PCVT:
 		return (vga_pcvt_mapchar(uni, index));
 #endif
 #ifdef WSCONS_SUPPORT_ISO7FONTS
 	case WSDISPLAY_FONTENC_ISO7:
 		return (vga_iso7_mapchar(uni, index));
 #endif
 	default:
 #ifdef VGAFONTDEBUG
 		printf("_vga_mapchar: encoding=%d\n", font->wsfont->encoding);

 @@ -1,14 +1,14 @@
-/* $NetBSD: wsconsio.h,v 1.95 2011/02/06 18:26:53 tsutsui Exp $ */
+/* $NetBSD: wsconsio.h,v 1.96 2011/06/08 10:25:21 drochner Exp $ */
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
+ *
  * 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
 @@ -394,26 +394,27 @@ struct wsdisplay_cursor {
  * XXX WARNING
  * XXX The following wsdisplay definitions are very preliminary and are likely
  * XXX to be changed without care about backwards compatibility!
  */
 struct wsdisplay_font {
 	const char *name;
 	int firstchar, numchars;
 	int encoding;
 #define	WSDISPLAY_FONTENC_ISO 0
 #define	WSDISPLAY_FONTENC_IBM 1
 #define	WSDISPLAY_FONTENC_PCVT 2
 #define	WSDISPLAY_FONTENC_ISO7 3 /* greek */
 #define	WSDISPLAY_FONTENC_ISO2 4 /* east european */
 #define	WSDISPLAY_FONTENC_KOI8_R 5 /* russian */
 	u_int fontwidth, fontheight, stride;
 #define	WSDISPLAY_MAXFONTSZ	(512*1024)
 	int bitorder, byteorder;
 #define	WSDISPLAY_FONTORDER_KNOWN 0	/* i.e, no need to convert */
 #define	WSDISPLAY_FONTORDER_L2R 1
 #define	WSDISPLAY_FONTORDER_R2L 2
 	void *data;
 };
 #define	WSDISPLAYIO_LDFONT	_IOW('W', 77, struct wsdisplay_font)
 struct wsdisplay_addscreendata {
 	int idx; /* screen index */
 	char *screentype;

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: wsfontload.8,v 1.24 2009/03/09 19:24:33 joerg Exp $
+.\"	$NetBSD: wsfontload.8,v 1.25 2011/06/08 10:25:21 drochner Exp $
 .\"
 .\" Copyright (c) 1999, 2001
 .\" 	Matthias Drochner.  All rights reserved.
 .\"
 .\" 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.
 .\"
 @@ -75,37 +75,44 @@ The options are:
 .It Fl f Ar wsdev
 Specify the device to operate on.
 Default is
 .Pa /dev/wsfont .
 .It Fl w Ar width
 Sets the width of a font character in pixels.
 Default is 8.
 .It Fl h Ar height
 Sets the height of a font character in pixels.
 Default is 16.
 .It Fl e Ar encoding
 Sets the encoding of the font.
 This can be either a symbolic abbreviation or a numeric value.
-Currently recognized abbreviations are
+Currently recognized abbreviations are:
-.Ql iso
+.Bl -tag -width xxxxxxx
-for ISO-8859-1 encoding,
+.It Ql iso
-.Ql ibm
+ISO-8859-1 encoding
-for IBM encoded fonts and
+.It Ql ibm
-.Ql pcvt
+IBM encoded fonts
-for the custom encoding of the supplemental fonts which came with
+.It Ql pcvt
-the
+the custom encoding of the supplemental fonts which came with the
 .Bx
 .Dq pcvt
-console driver.
+console driver
 .It Ql iso2
 ISO-8859-2 (east european) encoding
 .It Ql iso7
 ISO-8859-7 (greek) encoding
 .It Ql koi8r
 KOI8-R (russian) encoding
 .El
 Per default,
 .Ql iso
 is assumed.
 .It Fl N Ar name
 Specifies a name which can be used later to refer to the font.
 If none is given, the
 .Ar fontfile
 name is used to create one.
 .It Fl b
 Specifies that the font data is ordered right-to-left bit wise.
 The default is left-to-right.
 .It Fl B
 Specifies that the font data is ordered right-to-left byte wise.

 @@ -1,14 +1,14 @@
-/* $NetBSD: wsfontload.c,v 1.14 2009/04/19 02:25:48 lukem Exp $ */
+/* $NetBSD: wsfontload.c,v 1.15 2011/06/08 10:25:21 drochner Exp $ */
 /*
  * Copyright (c) 1999
  *	Matthias Drochner.  All rights reserved.
+ *
  * 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.
 @@ -58,26 +58,27 @@ static struct {
 	{ "l2r", WSDISPLAY_FONTORDER_L2R},
 	{ "r2l", WSDISPLAY_FONTORDER_R2L},
 };
 static struct {
 	const char *name;
 	int val;
 } encodings[] = {
 	{"iso", WSDISPLAY_FONTENC_ISO},
 	{"ibm", WSDISPLAY_FONTENC_IBM},
 	{"pcvt", WSDISPLAY_FONTENC_PCVT},
 	{"iso7", WSDISPLAY_FONTENC_ISO7},
 	{"iso2", WSDISPLAY_FONTENC_ISO2},
 	{"koi8r", WSDISPLAY_FONTENC_KOI8_R},
 };
 static void
 usage(void)
+{
 	(void)fprintf(stderr,
 		"usage: %s [-f wsdev] [-w width] [-h height] [-e encoding]"
 		" [-N name] [-b] [-B] [fontfile]\n",
 		      getprogname());
 	exit(1);
+}