 @@ -1,14 +1,14 @@
-/* $NetBSD: pcdisplay_chars.c,v 1.14 2010/02/10 19:45:30 drochner Exp $ */
+/* $NetBSD: pcdisplay_chars.c,v 1.15 2010/02/24 18:33:45 drochner Exp $ */
 /*
  * Copyright (c) 1998
  *	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.
 @@ -17,27 +17,27 @@
  * 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 AUTHOR 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/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay_chars.c,v 1.14 2010/02/10 19:45:30 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay_chars.c,v 1.15 2010/02/24 18:33:45 drochner Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <dev/ic/mc6845reg.h>
 #include <dev/ic/pcdisplayvar.h>
 #include <dev/wscons/unicode.h>
 #define CONTROL 1 /* XXX smiley */
 #define NOTPRINTABLE 4 /* diamond XXX watch out - not in ISO part! */
 @@ -255,51 +255,61 @@ static const struct {
 	{0x2663, 0x05}, /* BLACK CLUB SUIT */
 	{0x2665, 0x03}, /* BLACK HEART SUIT */
 	{0x2666, 0x04}, /* BLACK DIAMOND SUIT */
 	{0x266a, 0x0d}, /* EIGHTH NOTE */
 	{0x266b, 0x0e}, /* BEAMED EIGHTH NOTES */
 };
 static const struct {
 	u_int16_t uni;
 	u_char ibm;
 	int quality;
 } replacements[] = {
 	{0x00af, 0x2d, 3}, /* MACRON -> - */
 	{0x2010, 0x2d, 3}, /* HYPHEN -> - */
 	{0x2013, 0x2d, 3}, /* EN DASH -> - */
 	{0x2014, 0x2d, 3}, /* EM DASH -> - */
 	{0x2018, 0x60, 3}, /* LEFT SINGLE QUOTATION MARK -> ` */
 	{0x2019, 0x27, 3}, /* RIGHT SINGLE QUOTATION MARK -> ' */
 	{0x201A, 0x2c, 3}, /* SINGLE LOW QUOTATION MARK -> , */
 	{0x201c, 0x22, 3}, /* LEFT DOUBLE QUOTATION MARK -> " */
 	{0x201d, 0x22, 3}, /* RIGHT DOUBLE QUOTATION MARK -> " */
 	{0x2039, 0x3c, 3}, /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK -> < */
 	{0x203a, 0x3e, 3}, /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK -> > */
 	{0x221f, 0xc0, 3}, /* RIGHT ANGLE -> light up and right */
 	{0x222a, 0x55, 3}, /* UNION -> U */
 	{0x223c, 0x7e, 3}, /* TILDE OPERATOR -> ~ */
 	{0x2308, 0xda, 3}, /* LEFT CEILING -> light down and right */
 	{0x2309, 0xbf, 3}, /* RIGHT CEILING -> light down and left */
 	{0x230a, 0xc0, 3}, /* LEFT FLOOR -> light up and right */
 	{0x230b, 0xd9, 3}, /* RIGHT FLOOR -> light up and left */
 	{0x2329, 0x3c, 3}, /* LEFT-POINTING ANGLE BRACKET -> < */
 	{0x232a, 0x3e, 3}, /* RIGHT-POINTING ANGLE BRACKET -> > */
 	{_e003U, 0x2d, 3}, /* scan 5 -> - */
 	{_e005U, 0x5f, 3}, /* scan 9 -> _ */
 	{_e00bU, 0x7b, 3}, /* braceleftmid -> { */
 	{_e00cU, 0x7d, 3}, /* bracerightmid -> } */
 	{_e00fU, 0xd9, 3}, /* mirrored not sign? -> light up and left */
 	{0x00d7, 0x78, 2}, /* MULTIPLICATION SIGN -> x */
 	{0x00d8, 0xe9, 2}, /* LATIN CAPITAL LETTER O WITH STROKE -> Theta */
 	{0x00f8, 0xed, 2}, /* LATIN SMALL LETTER O WITH STROKE -> phi */
 	{0x03a0, 0xe3, 2}, /* GREEK CAPITAL LETTER PI -> pi */
 	{0x03a5, 0x59, 2}, /* GREEK CAPITAL LETTER UPSILON -> Y */
 	{0x03b3, 0x59, 2}, /* GREEK SMALL LETTER GAMMA -> Y */
 	{0x03b8, 0xe9, 2}, /* GREEK SMALL LETTER THETA -> Theta */
 	{0x03bd, 0x76, 2}, /* GREEK SMALL LETTER NU -> v */
 	{0x03c9, 0x77, 2}, /* GREEK SMALL LETTER OMEGA -> w */
 	{0x20ac, 0x45, 2}, /* EURO SIGN -> E */
 	{0x25cf, 0xf9, 2}, /* BLACK CIRCLE */
 	{_e002U, 0x2d, 2}, /* scan 3 -> - */
 	{_e004U, 0x2d, 2}, /* scan 7 -> - */
 	{_e007U, 0xda, 2}, /* bracelefttp -> light down and right */
 	{_e008U, 0xc0, 2}, /* braceleftbt -> light up and right */
 	{_e009U, 0xbf, 2}, /* bracerighttp -> light down and left */
 	{_e00aU, 0xd9, 2}, /* bracerighrbt -> light up and left */
 	{_e00dU, 0x3c, 2}, /* inverted angle? -> < */
 	{_e00eU, 0x3c, 2}, /* angle? -> < */
 	{_e00fU, 0xd9, 2}, /* mirrored not sign? -> light up and left */
 	{0x00a9, 0x63, 1}, /* COPYRIGHT SIGN -> c */
 	{0x00ae, 0x72, 1}, /* REGISTERED SIGN -> r */
 	{0x00b3, 0x33, 1}, /* SUPERSCRIPT THREE -> 3 */
 	{0x00b9, 0x39, 1}, /* SUPERSCRIPT ONE -> 1 */
 @@ -340,26 +350,30 @@ static const struct {
 	{0x0159, 0x72, 1}, /* LATIN SMALL LETTER R WITH CARON -> r */
 	{0x0160, 0x53, 1}, /* LATIN CAPITAL LETTER S WITH CARON -> S */
 	{0x0161, 0x73, 1}, /* LATIN SMALLLETTER S WITH CARON -> s */
 	{0x0164, 0x54, 1}, /* LATIN CAPITAL LETTER T WITH CARON -> T */
 	{0x0165, 0x74, 1}, /* LATIN SMALL LETTER T WITH CARON -> t */
 	{0x016c, 0x55, 1}, /* LATIN CAPITAL LETTER U WITH BREVE -> U */
 	{0x016d, 0x75, 1}, /* LATIN SMALL LETTER U WITH BREVE -> u */
 	{0x016e, 0x55, 1}, /* LATIN CAPITAL LETTER U WITH RING ABOVE -> U */
 	{0x016f, 0x75, 1}, /* LATIN SMALL LETTER U WITH RING ABOVE -> u */
 	{0x0170, 0x9a, 1}, /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
 	{0x0171, 0x81, 1}, /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */
 	{0x017d, 0x5a, 1}, /* LATIN CAPITAL LETTER Z WITH CARON -> Z */
 	{0x017e, 0x7a, 1}, /* LATIN SMALL LETTER Z WITH CARON -> z */
 	{0x201e, 0x22, 1}, /* DOUBLE LOW QUOTATION MARK -> " */
 	{0x2026, 0x5f, 1}, /* HORIZONTAL ELLIPSIS -> _ */
 	{0x25a1, 0xfe, 1}, /* WHITE SQUARE */
 	{0x2606, 0x2a, 1}, /* WHITE STAR -> * */
 };
 int
 pcdisplay_mapchar(void *id, int uni, unsigned int *index)
+{
 	u_int i;
 	if (uni < 128) {
 		*index = uni;
 		return (5);
 	} else if ((uni < 256) && (isomappings[uni - 128] != NOTPRINTABLE)) {
 		*index = isomappings[uni - 128];
 		return (5);