src - OpenBSD base system

diff options


context:
space:
mode:

author	Miod Vallat <miod@cvs.openbsd.org>	2006-08-06 16:00:47 +0000
committer	Miod Vallat <miod@cvs.openbsd.org>	2006-08-06 16:00:47 +0000
commit	d8887d8611b9f20645651e1a659fad201cbab8d7 (patch)
tree	26c73a3abeffdff828b80bcd1703d29a7a9052f3 /sys
parent	d96598e887c131b0c998a828c237d992881de300 (diff)

Convert the Sony wsfonts to ISO-Latin1 encoding, and drop the Sony encoding

conversion tables; from NetBSD.

Diffstat (limited to 'sys')

-rw-r--r--

sys/dev/wscons/wsconsio.h

-rw-r--r--

sys/dev/wsfont/sony12x24.h

1862

-rw-r--r--

sys/dev/wsfont/sony8x16.h

1348

-rw-r--r--

sys/dev/wsfont/wsfont.c

4 files changed, 1618 insertions, 1670 deletions

diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h
index 16ef32f7a6b..3fb5988a178 100644
--- a/sys/dev/wscons/wsconsio.h
+++ b/sys/dev/wscons/wsconsio.h

@@ -1,4 +1,4 @@

-/* $OpenBSD: wsconsio.h,v 1.41 2006/07/24 22:19:54 miod Exp $ */

+/* $OpenBSD: wsconsio.h,v 1.42 2006/08/06 16:00:45 miod Exp $ */

/* $NetBSD: wsconsio.h,v 1.74 2005/04/28 07:15:44 martin Exp $ */

@@ -367,7 +367,6 @@ struct wsdisplay_font {

#define WSDISPLAY_FONTENC_IBM 1

#define WSDISPLAY_FONTENC_PCVT 2

#define WSDISPLAY_FONTENC_ISO7 3 /* greek */

-#define WSDISPLAY_FONTENC_SONY 4

u_int fontwidth, fontheight, stride;

#define WSDISPLAY_MAXFONTSZ (512*1024)

int bitorder, byteorder;

diff --git a/sys/dev/wsfont/sony12x24.h b/sys/dev/wsfont/sony12x24.h
index c5adb68d8f3..51f99e250fa 100644
--- a/sys/dev/wsfont/sony12x24.h
+++ b/sys/dev/wsfont/sony12x24.h

@@ -1,5 +1,5 @@

-/* $OpenBSD: sony12x24.h,v 1.2 2003/06/02 23:28:04 millert Exp $ */

-/* $NetBSD: sony12x24.h,v 1.1 2000/11/21 11:44:45 tsutsui Exp $ */

+/* $OpenBSD: sony12x24.h,v 1.3 2006/08/06 16:00:46 miod Exp $ */

+/* $NetBSD: sony12x24.h,v 1.9 2005/12/11 12:24:12 christos Exp $ */

@@ -38,14 +38,14 @@

/* This font data is generated from sys/arch/newsmips/dev/fnt24.c */

-extern u_char sony12x24_data[];

+static u_char sony12x24_data[];

-struct wsdisplay_font sony12x24 = {

+static struct wsdisplay_font sony12x24 = {

"sony12x24", /* typeface name */

0, /* index */

' ', /* firstchar */

0xff - ' ' + 1, /* numchars */

- WSDISPLAY_FONTENC_SONY, /* encoding */

+ WSDISPLAY_FONTENC_ISO, /* encoding */

12, /* width */

24, /* height */

2, /* stride */

@@ -3417,6 +3417,838 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

+ 0x00, 0x00, /* ............ */

+ /* 0x82 */

+ 0x00, 0x00, /* ............ */

+ /* 0x83 */

+ 0x00, 0x00, /* ............ */

+ /* 0x84 */

+ 0x00, 0x00, /* ............ */

+ /* 0x85 */

+ 0x00, 0x00, /* ............ */

+ /* 0x86 */

+ 0x00, 0x00, /* ............ */

+ /* 0x87 */

+ 0x00, 0x00, /* ............ */

+ /* 0x88 */

+ 0x00, 0x00, /* ............ */

+ /* 0x89 */

+ 0x00, 0x00, /* ............ */

+ /* 0x8A */

+ 0x00, 0x00, /* ............ */

+ /* 0x8B */

+ 0x00, 0x00, /* ............ */

+ /* 0x8C */

+ 0x00, 0x00, /* ............ */

+ /* 0x8D */

+ 0x00, 0x00, /* ............ */

+ /* 0x8E */

+ 0x00, 0x00, /* ............ */

+ /* 0x8F */

+ 0x00, 0x00, /* ............ */

+ /* 0x90 */

+ 0x00, 0x00, /* ............ */

+ /* 0x91 */

+ 0x00, 0x00, /* ............ */

+ /* 0x92 */

+ 0x00, 0x00, /* ............ */

+ /* 0x93 */

+ 0x00, 0x00, /* ............ */

+ /* 0x94 */

+ 0x00, 0x00, /* ............ */

+ /* 0x95 */

+ 0x00, 0x00, /* ............ */

+ /* 0x96 */

+ 0x00, 0x00, /* ............ */

+ /* 0x97 */

+ 0x00, 0x00, /* ............ */

+ /* 0x98 */

+ 0x00, 0x00, /* ............ */

+ /* 0x99 */

+ 0x00, 0x00, /* ............ */

+ /* 0x9A */

+ 0x00, 0x00, /* ............ */

+ /* 0x9B */

+ 0x00, 0x00, /* ............ */

+ /* 0x9C */

+ 0x00, 0x00, /* ............ */

+ /* 0x9D */

+ 0x00, 0x00, /* ............ */

+ /* 0x9E */

+ 0x00, 0x00, /* ............ */

+ /* 0x9F */

+ 0x00, 0x00, /* ............ */

+ /* 0xA0 */

+ 0x00, 0x00, /* ............ */

+ /* 0xA1 */

+ 0x00, 0x00, /* ............ */

0x0e, 0x00, /* ....***..... */

@@ -3439,7 +4271,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x82 */

+ /* 0xA2 */

0x00, 0x00, /* ............ */

0x04, 0x00, /* .....*...... */

@@ -3465,7 +4297,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x83 */

+ /* 0xA3 */

0x00, 0x00, /* ............ */

@@ -3491,7 +4323,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x84 */

+ /* 0xA4 */

0x00, 0x00, /* ............ */

@@ -3517,7 +4349,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x85 */

+ /* 0xA5 */

0x00, 0x00, /* ............ */

@@ -3543,7 +4375,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x86 */

+ /* 0xA6 */

0x00, 0x00, /* ............ */

0x06, 0x00, /* .....**..... */

@@ -3569,7 +4401,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x87 */

+ /* 0xA7 */

0x00, 0x00, /* ............ */

0x0f, 0x00, /* ....****.... */

@@ -3595,7 +4427,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x88 */

+ /* 0xA8 */

0x00, 0x00, /* ............ */

0x19, 0x80, /* ...**..**... */

@@ -3621,7 +4453,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x89 */

+ /* 0xA9 */

0x00, 0x00, /* ............ */

0x0f, 0x00, /* ....****.... */

@@ -3647,7 +4479,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x8A */

+ /* 0xAA */

0x00, 0x00, /* ............ */

0x07, 0x00, /* .....***.... */

@@ -3673,7 +4505,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x8B */

+ /* 0xAB */

0x00, 0x00, /* ............ */

0x02, 0x20, /* ......*...*. */

@@ -3699,7 +4531,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x8C */

+ /* 0xAC */

0x00, 0x00, /* ............ */

@@ -3725,7 +4557,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x8D */

+ /* 0xAD */

0x00, 0x00, /* ............ */

@@ -3751,7 +4583,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x8E */

+ /* 0xAE */

0x00, 0x00, /* ............ */

0x0f, 0x00, /* ....****.... */

@@ -3777,7 +4609,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x8F */

+ /* 0xAF */

0x00, 0x00, /* ............ */

@@ -3803,7 +4635,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x90 */

+ /* 0xB0 */

0x00, 0x00, /* ............ */

0x0e, 0x00, /* ....***..... */

@@ -3829,7 +4661,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x91 */

+ /* 0xB1 */

0x00, 0x00, /* ............ */

@@ -3855,7 +4687,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x92 */

+ /* 0xB2 */

0x00, 0x00, /* ............ */

0x0f, 0x00, /* ....****.... */

@@ -3881,7 +4713,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x93 */

+ /* 0xB3 */

0x00, 0x00, /* ............ */

0x0f, 0x00, /* ....****.... */

@@ -3907,7 +4739,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x94 */

+ /* 0xB4 */

0x00, 0x00, /* ............ */

0x03, 0x80, /* ......***... */

@@ -3933,7 +4765,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x95 */

+ /* 0xB5 */

0x00, 0x00, /* ............ */

@@ -3959,7 +4791,7 @@ static u_char sony12x24_data[] = {

0xc0, 0x00, /* **.......... */

- /* 0x96 */

+ /* 0xB6 */

0x00, 0x00, /* ............ */

0x1f, 0xf0, /* ...********* */

@@ -3985,7 +4817,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x97 */

+ /* 0xB7 */

0x00, 0x00, /* ............ */

@@ -4011,7 +4843,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x98 */

+ /* 0xB8 */

0x00, 0x00, /* ............ */

@@ -4037,7 +4869,7 @@ static u_char sony12x24_data[] = {

0x0c, 0x00, /* ....**...... */

0x10, 0x00, /* ...*........ */

- /* 0x99 */

+ /* 0xB9 */

0x00, 0x00, /* ............ */

0x06, 0x00, /* .....**..... */

@@ -4063,7 +4895,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x9A */

+ /* 0xBA */

0x00, 0x00, /* ............ */

0x07, 0x00, /* .....***.... */

@@ -4089,7 +4921,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x9B */

+ /* 0xBB */

0x00, 0x00, /* ............ */

0x44, 0x00, /* .*...*...... */

@@ -4115,7 +4947,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x9C */

+ /* 0xBC */

0x00, 0x00, /* ............ */

0x30, 0x00, /* ..**........ */

@@ -4141,7 +4973,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x9D */

+ /* 0xBD */

0x00, 0x00, /* ............ */

0x30, 0x00, /* ..**........ */

@@ -4167,7 +4999,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x9E */

+ /* 0xBE */

0x00, 0x00, /* ............ */

0x78, 0x00, /* .****....... */

@@ -4193,7 +5025,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0x9F */

+ /* 0xBF */

0x00, 0x00, /* ............ */

0x07, 0x00, /* .....***.... */

@@ -4219,7 +5051,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xA0 */

+ /* 0xC0 */

0x38, 0x00, /* ..***....... */

0x0c, 0x00, /* ....**...... */

0x02, 0x00, /* ......*..... */

@@ -4245,7 +5077,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xA1 */

+ /* 0xC1 */

0x01, 0xc0, /* .......***.. */

0x03, 0x00, /* ......**.... */

0x04, 0x00, /* .....*...... */

@@ -4271,7 +5103,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xA2 */

+ /* 0xC2 */

0x06, 0x00, /* .....**..... */

0x19, 0x80, /* ...**..**... */

0x20, 0x40, /* ..*......*.. */

@@ -4297,7 +5129,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xA3 */

+ /* 0xC3 */

0x1c, 0xc0, /* ...***..**.. */

0x67, 0x00, /* .**..***.... */

0x00, 0x00, /* ............ */

@@ -4323,7 +5155,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xA4 */

+ /* 0xC4 */

0x19, 0x80, /* ...**..**... */

0x00, 0x00, /* ............ */

@@ -4349,7 +5181,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xA5 */

+ /* 0xC5 */

0x0f, 0x00, /* ....****.... */

0x19, 0x80, /* ...**..**... */

@@ -4375,7 +5207,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xA6 */

+ /* 0xC6 */

0x00, 0x00, /* ............ */

0x07, 0xf0, /* .....******* */

@@ -4401,7 +5233,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xA7 */

+ /* 0xC7 */

0x00, 0x00, /* ............ */

0x07, 0x20, /* .....***..*. */

@@ -4427,7 +5259,7 @@ static u_char sony12x24_data[] = {

0x01, 0x00, /* .......*.... */

0x06, 0x00, /* .....**..... */

- /* 0xA8 */

+ /* 0xC8 */

0x38, 0x00, /* ..***....... */

0x0c, 0x00, /* ....**...... */

0x02, 0x00, /* ......*..... */

@@ -4453,7 +5285,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xA9 */

+ /* 0xC9 */

0x03, 0x80, /* ......***... */

0x06, 0x00, /* .....**..... */

0x08, 0x00, /* ....*....... */

@@ -4479,7 +5311,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xAA */

+ /* 0xCA */

0x04, 0x00, /* .....*...... */

0x1b, 0x00, /* ...**.**.... */

0x60, 0xc0, /* .**.....**.. */

@@ -4505,7 +5337,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xAB */

+ /* 0xCB */

0x33, 0x00, /* ..**..**.... */

0x00, 0x00, /* ............ */

@@ -4531,7 +5363,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xAC */

+ /* 0xCC */

0x38, 0x00, /* ..***....... */

0x0c, 0x00, /* ....**...... */

0x02, 0x00, /* ......*..... */

@@ -4557,7 +5389,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xAD */

+ /* 0xCD */

0x07, 0x00, /* .....***.... */

0x0c, 0x00, /* ....**...... */

0x10, 0x00, /* ...*........ */

@@ -4583,7 +5415,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xAE */

+ /* 0xCE */

0x0c, 0x00, /* ....**...... */

0x12, 0x00, /* ...*..*..... */

0x21, 0x00, /* ..*....*.... */

@@ -4609,7 +5441,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xAF */

+ /* 0xCF */

0x33, 0x00, /* ..**..**.... */

0x00, 0x00, /* ............ */

@@ -4635,7 +5467,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xB0 */

+ /* 0xD0 */

0x00, 0x00, /* ............ */

0xfc, 0x00, /* ******...... */

@@ -4661,7 +5493,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xB1 */

+ /* 0xD1 */

0x1c, 0xc0, /* ...***..**.. */

0x67, 0x00, /* .**..***.... */

0x00, 0x00, /* ............ */

@@ -4687,7 +5519,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xB2 */

+ /* 0xD2 */

0x38, 0x00, /* ..***....... */

0x0c, 0x00, /* ....**...... */

0x02, 0x00, /* ......*..... */

@@ -4713,7 +5545,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xB3 */

+ /* 0xD3 */

0x03, 0x80, /* ......***... */

0x06, 0x00, /* .....**..... */

0x08, 0x00, /* ....*....... */

@@ -4739,7 +5571,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xB4 */

+ /* 0xD4 */

0x04, 0x00, /* .....*...... */

0x1b, 0x00, /* ...**.**.... */

0x60, 0xc0, /* .**.....**.. */

@@ -4765,7 +5597,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xB5 */

+ /* 0xD5 */

0x1c, 0xc0, /* ...***..**.. */

0x67, 0x00, /* .**..***.... */

0x00, 0x00, /* ............ */

@@ -4791,7 +5623,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xB6 */

+ /* 0xD6 */

0x31, 0x80, /* ..**...**... */

0x00, 0x00, /* ............ */

@@ -4817,7 +5649,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xB7 */

+ /* 0xD7 */

0x00, 0x00, /* ............ */

@@ -4843,7 +5675,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xB8 */

+ /* 0xD8 */

0x00, 0x00, /* ............ */

0x00, 0x40, /* .........*.. */

0x1f, 0x40, /* ...*****.*.. */

@@ -4869,7 +5701,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xB9 */

+ /* 0xD9 */

0x1c, 0x00, /* ...***...... */

0x06, 0x00, /* .....**..... */

0x01, 0x00, /* .......*.... */

@@ -4895,7 +5727,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xBA */

+ /* 0xDA */

0x03, 0x80, /* ......***... */

0x06, 0x00, /* .....**..... */

0x08, 0x00, /* ....*....... */

@@ -4921,7 +5753,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xBB */

+ /* 0xDB */

0x04, 0x00, /* .....*...... */

0x1b, 0x00, /* ...**.**.... */

0x60, 0xc0, /* .**.....**.. */

@@ -4947,7 +5779,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xBC */

+ /* 0xDC */

0x31, 0x80, /* ..**...**... */

0x00, 0x00, /* ............ */

@@ -4973,7 +5805,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xBD */

+ /* 0xDD */

0x03, 0x80, /* ......***... */

0x06, 0x00, /* .....**..... */

0x08, 0x00, /* ....*....... */

@@ -4999,7 +5831,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xBE */

+ /* 0xDE */

0x00, 0x00, /* ............ */

0xf0, 0x00, /* ****........ */

@@ -5025,7 +5857,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xBF */

+ /* 0xDF */

0x00, 0x00, /* ............ */

0x3e, 0x00, /* ..*****..... */

@@ -5051,7 +5883,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xC0 */

+ /* 0xE0 */

0x00, 0x00, /* ............ */

0x38, 0x00, /* ..***....... */

@@ -5077,7 +5909,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xC1 */

+ /* 0xE1 */

0x00, 0x00, /* ............ */

0x07, 0x00, /* .....***.... */

@@ -5103,7 +5935,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xC2 */

+ /* 0xE2 */

0x00, 0x00, /* ............ */

0x0c, 0x00, /* ....**...... */

@@ -5129,7 +5961,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xC3 */

+ /* 0xE3 */

0x00, 0x00, /* ............ */

@@ -5155,7 +5987,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xC4 */

+ /* 0xE4 */

0x00, 0x00, /* ............ */

@@ -5181,7 +6013,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xC5 */

+ /* 0xE5 */

0x00, 0x00, /* ............ */

0x1e, 0x00, /* ...****..... */

@@ -5207,7 +6039,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xC6 */

+ /* 0xE6 */

0x00, 0x00, /* ............ */

@@ -5233,7 +6065,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xC7 */

+ /* 0xE7 */

0x00, 0x00, /* ............ */

@@ -5259,7 +6091,7 @@ static u_char sony12x24_data[] = {

0x01, 0x00, /* .......*.... */

0x06, 0x00, /* .....**..... */

- /* 0xC8 */

+ /* 0xE8 */

0x00, 0x00, /* ............ */

0x38, 0x00, /* ..***....... */

@@ -5285,7 +6117,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xC9 */

+ /* 0xE9 */

0x00, 0x00, /* ............ */

0x07, 0x00, /* .....***.... */

@@ -5311,7 +6143,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xCA */

+ /* 0xEA */

0x00, 0x00, /* ............ */

0x0e, 0x00, /* ....***..... */

@@ -5337,7 +6169,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xCB */

+ /* 0xEB */

0x00, 0x00, /* ............ */

@@ -5363,7 +6195,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xCC */

+ /* 0xEC */

0x00, 0x00, /* ............ */

0x38, 0x00, /* ..***....... */

@@ -5389,7 +6221,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xCD */

+ /* 0xED */

0x00, 0x00, /* ............ */

0x07, 0x00, /* .....***.... */

@@ -5415,7 +6247,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xCE */

+ /* 0xEE */

0x00, 0x00, /* ............ */

0x0c, 0x00, /* ....**...... */

@@ -5441,7 +6273,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xCF */

+ /* 0xEF */

0x00, 0x00, /* ............ */

@@ -5467,7 +6299,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xD0 */

+ /* 0xF0 */

0x00, 0x00, /* ............ */

@@ -5493,7 +6325,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xD1 */

+ /* 0xF1 */

0x00, 0x00, /* ............ */

@@ -5519,7 +6351,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xD2 */

+ /* 0xF2 */

0x00, 0x00, /* ............ */

0x38, 0x00, /* ..***....... */

@@ -5545,7 +6377,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xD3 */

+ /* 0xF3 */

0x00, 0x00, /* ............ */

0x07, 0x00, /* .....***.... */

@@ -5571,7 +6403,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xD4 */

+ /* 0xF4 */

0x00, 0x00, /* ............ */

0x04, 0x00, /* .....*...... */

@@ -5597,7 +6429,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xD5 */

+ /* 0xF5 */

0x00, 0x00, /* ............ */

@@ -5623,7 +6455,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xD6 */

+ /* 0xF6 */

0x00, 0x00, /* ............ */

@@ -5649,7 +6481,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xD7 */

+ /* 0xF7 */

0x00, 0x00, /* ............ */

@@ -5675,7 +6507,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xD8 */

+ /* 0xF8 */

0x00, 0x00, /* ............ */

@@ -5701,7 +6533,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xD9 */

+ /* 0xF9 */

0x00, 0x00, /* ............ */

0x38, 0x00, /* ..***....... */

@@ -5727,7 +6559,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xDA */

+ /* 0xFA */

0x00, 0x00, /* ............ */

0x07, 0x00, /* .....***.... */

@@ -5753,7 +6585,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xDB */

+ /* 0xFB */

0x00, 0x00, /* ............ */

0x04, 0x00, /* .....*...... */

@@ -5779,7 +6611,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xDC */

+ /* 0xFC */

0x00, 0x00, /* ............ */

@@ -5805,7 +6637,7 @@ static u_char sony12x24_data[] = {

0x00, 0x00, /* ............ */

- /* 0xDD */

+ /* 0xFD */

0x00, 0x00, /* ............ */

0x07, 0x00, /* .....***.... */

@@ -5831,7 +6663,7 @@ static u_char sony12x24_data[] = {

0xc8, 0x00, /* **..*....... */

0x70, 0x00, /* .***........ */

- /* 0xDE */

+ /* 0xFE */

0x00, 0x00, /* ............ */

@@ -5857,7 +6689,7 @@ static u_char sony12x24_data[] = {

0x60, 0x00, /* .**......... */

0xf0, 0x00, /* ****........ */

- /* 0xDF */

+ /* 0xFF */

0x00, 0x00, /* ............ */

@@ -5882,836 +6714,4 @@ static u_char sony12x24_data[] = {

0xc8, 0x00, /* **..*....... */

0x70, 0x00, /* .***........ */

- /* 0xE0 */

- 0x00, 0x00, /* ............ */

- /* 0xE1 */

- 0x00, 0x00, /* ............ */

- 0x78, 0x00, /* .****....... */

- 0xcc, 0x00, /* **..**...... */

- 0x78, 0x00, /* .****....... */

- 0x00, 0x00, /* ............ */

- /* 0xE2 */

- 0x00, 0x00, /* ............ */

- 0x01, 0xf0, /* .......***** */

- 0x01, 0x80, /* .......**... */

- 0x00, 0x00, /* ............ */

- /* 0xE3 */

- 0x00, 0x00, /* ............ */

- 0x18, 0x00, /* ...**....... */

- 0xf8, 0x00, /* *****....... */

- 0x00, 0x00, /* ............ */

- /* 0xE4 */

- 0x00, 0x00, /* ............ */

- 0x40, 0x00, /* .*.......... */

- 0x60, 0x00, /* .**......... */

- 0x20, 0x00, /* ..*......... */

- 0x30, 0x00, /* ..**........ */

- 0x00, 0x00, /* ............ */

- /* 0xE5 */

- 0x00, 0x00, /* ............ */

- 0x06, 0x00, /* .....**..... */

- 0x0f, 0x00, /* ....****.... */

- 0x06, 0x00, /* .....**..... */

- 0x00, 0x00, /* ............ */

- /* 0xE6 */

- 0x00, 0x00, /* ............ */

- 0x00, 0x40, /* .........*.. */

- 0x7f, 0xe0, /* .**********. */

- 0x00, 0xc0, /* ........**.. */

- 0x3f, 0xc0, /* ..********.. */

- 0x00, 0xc0, /* ........**.. */

- 0x01, 0x80, /* .......**... */

- 0x03, 0x00, /* ......**.... */

- 0x06, 0x00, /* .....**..... */

- 0x0c, 0x00, /* ....**...... */

- 0x18, 0x00, /* ...**....... */

- 0x00, 0x00, /* ............ */

- /* 0xE7 */

- 0x00, 0x00, /* ............ */

- 0x0f, 0xc0, /* ....******.. */

- 0x3f, 0xc0, /* ..********.. */

- 0x38, 0xc0, /* ..***...**.. */

- 0x00, 0x80, /* ........*... */

- 0x07, 0x80, /* .....****... */

- 0x07, 0x00, /* .....***.... */

- 0x06, 0x00, /* .....**..... */

- 0x04, 0x00, /* .....*...... */

- 0x0c, 0x00, /* ....**...... */

- 0x08, 0x00, /* ....*....... */

- 0x18, 0x00, /* ...**....... */

- 0x10, 0x00, /* ...*........ */

- 0x00, 0x00, /* ............ */

- /* 0xE8 */

- 0x00, 0x00, /* ............ */

- 0x01, 0x00, /* .......*.... */

- 0x01, 0x80, /* .......**... */

- 0x00, 0x80, /* ........*... */

- 0x01, 0x80, /* .......**... */

- 0x03, 0x00, /* ......**.... */

- 0x07, 0x00, /* .....***.... */

- 0x0f, 0x00, /* ....****.... */

- 0x1b, 0x00, /* ...**.**.... */

- 0x13, 0x00, /* ...*..**.... */

- 0x03, 0x00, /* ......**.... */

- 0x00, 0x00, /* ............ */

- /* 0xE9 */

- 0x00, 0x00, /* ............ */

- 0x04, 0x00, /* .....*...... */

- 0x06, 0x00, /* .....**..... */

- 0x26, 0x80, /* ..*..**.*... */

- 0x3f, 0x80, /* ..*******... */

- 0x30, 0x80, /* ..**....*... */

- 0x31, 0x80, /* ..**...**... */

- 0x01, 0x00, /* .......*.... */

- 0x03, 0x00, /* ......**.... */

- 0x02, 0x00, /* ......*..... */

- 0x06, 0x00, /* .....**..... */

- 0x04, 0x00, /* .....*...... */

- 0x0c, 0x00, /* ....**...... */

- 0x00, 0x00, /* ............ */

- /* 0xEA */

- 0x00, 0x00, /* ............ */

- 0x3f, 0x80, /* ..*******... */

- 0x06, 0x00, /* .....**..... */

- 0x3f, 0xe0, /* ..*********. */

- 0x00, 0x00, /* ............ */

- /* 0xEB */

- 0x00, 0x00, /* ............ */

- 0x02, 0x00, /* ......*..... */

- 0x03, 0x00, /* ......**.... */

- 0x3f, 0xc0, /* ..********.. */

- 0x07, 0x00, /* .....***.... */

- 0x0f, 0x00, /* ....****.... */

- 0x0b, 0x00, /* ....*.**.... */

- 0x1b, 0x00, /* ...**.**.... */

- 0x13, 0x00, /* ...*..**.... */

- 0x33, 0x00, /* ..**..**.... */

- 0x27, 0x00, /* ..*..***.... */

- 0x02, 0x00, /* ......*..... */

- 0x00, 0x00, /* ............ */

- /* 0xEC */

- 0x00, 0x00, /* ............ */

- 0x08, 0x00, /* ....*....... */

- 0x0c, 0x00, /* ....**...... */

- 0x0c, 0x80, /* ....**..*... */

- 0x0f, 0xc0, /* ....******.. */

- 0x7c, 0xc0, /* .*****..**.. */

- 0x3c, 0x80, /* ..****..*... */

- 0x05, 0x80, /* .....*.**... */

- 0x05, 0x00, /* .....*.*.... */

- 0x04, 0x00, /* .....*...... */

- 0x06, 0x00, /* .....**..... */

- 0x00, 0x00, /* ............ */

- /* 0xED */

- 0x00, 0x00, /* ............ */

- 0x01, 0x80, /* .......**... */

- 0x1f, 0x80, /* ...******... */

- 0x01, 0x80, /* .......**... */

- 0x7f, 0xc0, /* .*********.. */

- 0x7f, 0xe0, /* .**********. */

- 0x00, 0x00, /* ............ */

- /* 0xEE */

- 0x00, 0x00, /* ............ */

- 0x00, 0xc0, /* ........**.. */

- 0x3f, 0xc0, /* ..********.. */

- 0x1f, 0xc0, /* ...*******.. */

- 0x00, 0xc0, /* ........**.. */

- 0x1f, 0xc0, /* ...*******.. */

- 0x1f, 0x80, /* ...******... */

- 0x00, 0x80, /* ........*... */

- 0x3f, 0xc0, /* ..********.. */

- 0x1f, 0xc0, /* ...*******.. */

- 0x00, 0x00, /* ............ */

- /* 0xEF */

- 0x00, 0x00, /* ............ */

- 0x08, 0x00, /* ....*....... */

- 0x2c, 0x00, /* ..*.**...... */

- 0x24, 0xc0, /* ..*..*..**.. */

- 0x36, 0xc0, /* ..**.**.**.. */

- 0x12, 0xc0, /* ...*..*.**.. */

- 0x1a, 0xc0, /* ...**.*.**.. */

- 0x08, 0x80, /* ....*...*... */

- 0x00, 0x80, /* ........*... */

- 0x01, 0x80, /* .......**... */

- 0x01, 0x00, /* .......*.... */

- 0x03, 0x00, /* ......**.... */

- 0x02, 0x00, /* ......*..... */

- 0x06, 0x00, /* .....**..... */

- 0x0c, 0x00, /* ....**...... */

- 0x1c, 0x00, /* ...***...... */

- 0x00, 0x00, /* ............ */

- /* 0xF0 */

- 0x00, 0x00, /* ............ */

- 0xff, 0xf0, /* ************ */

- 0x00, 0x00, /* ............ */

- /* 0xF1 */

- 0x00, 0x00, /* ............ */

- 0x07, 0xe0, /* .....******. */

- 0x5f, 0xe0, /* .*.********. */

- 0x7c, 0x60, /* .*****...**. */

- 0x20, 0xc0, /* ..*.....**.. */

- 0x05, 0x80, /* .....*.**... */

- 0x07, 0x80, /* .....****... */

- 0x07, 0x00, /* .....***.... */

- 0x06, 0x00, /* .....**..... */

- 0x04, 0x00, /* .....*...... */

- 0x0c, 0x00, /* ....**...... */

- 0x08, 0x00, /* ....*....... */

- 0x18, 0x00, /* ...**....... */

- 0x10, 0x00, /* ...*........ */

- 0x30, 0x00, /* ..**........ */

- 0x20, 0x00, /* ..*......... */

- 0x00, 0x00, /* ............ */

- /* 0xF2 */

- 0x00, 0x00, /* ............ */

- 0x00, 0x80, /* ........*... */

- 0x00, 0xc0, /* ........**.. */

- 0x01, 0x80, /* .......**... */

- 0x03, 0x00, /* ......**.... */

- 0x06, 0x00, /* .....**..... */

- 0x0e, 0x00, /* ....***..... */

- 0x1a, 0x00, /* ...**.*..... */

- 0x32, 0x00, /* ..**..*..... */

- 0x62, 0x00, /* .**...*..... */

- 0x42, 0x00, /* .*....*..... */

- 0x02, 0x00, /* ......*..... */

- 0x00, 0x00, /* ............ */

- /* 0xF3 */

- 0x00, 0x00, /* ............ */

- 0x04, 0x00, /* .....*...... */

- 0x06, 0x00, /* .....**..... */

- 0x46, 0x40, /* .*...**..*.. */

- 0x7f, 0xe0, /* .**********. */

- 0x3f, 0xc0, /* ..********.. */

- 0x20, 0xc0, /* ..*.....**.. */

- 0x20, 0x80, /* ..*.....*... */

- 0x21, 0x80, /* ..*....**... */

- 0x01, 0x80, /* .......**... */

- 0x03, 0x00, /* ......**.... */

- 0x06, 0x00, /* .....**..... */

- 0x0c, 0x00, /* ....**...... */

- 0x18, 0x00, /* ...**....... */

- 0x00, 0x00, /* ............ */

- /* 0xF4 */

- 0x00, 0x00, /* ............ */

- 0x23, 0xc0, /* ..*...****.. */

- 0x3f, 0xc0, /* ..********.. */

- 0x3e, 0x00, /* ..*****..... */

- 0x06, 0x00, /* .....**..... */

- 0x06, 0x20, /* .....**...*. */

- 0xcf, 0xf0, /* **..******** */

- 0x7f, 0xf0, /* .*********** */

- 0x70, 0x00, /* .***........ */

- 0x00, 0x00, /* ............ */

- /* 0xF5 */

- 0x00, 0x00, /* ............ */

- 0x06, 0x00, /* .....**..... */

- 0x02, 0x00, /* ......*..... */

- 0x03, 0x00, /* ......**.... */

- 0x43, 0xf0, /* .*....****** */

- 0x7f, 0xf0, /* .*********** */

- 0x7f, 0x00, /* .*******.... */

- 0x03, 0x00, /* ......**.... */

- 0x07, 0x00, /* .....***.... */

- 0x05, 0x00, /* .....*.*.... */

- 0x0d, 0x00, /* ....**.*.... */

- 0x09, 0x00, /* ....*..*.... */

- 0x19, 0x00, /* ...**..*.... */

- 0x11, 0x00, /* ...*...*.... */

- 0x35, 0x00, /* ..**.*.*.... */

- 0x67, 0x00, /* .**..***.... */

- 0xc3, 0x00, /* **....**.... */

- 0x00, 0x00, /* ............ */

- /* 0xF6 */

- 0x00, 0x00, /* ............ */

- 0x0c, 0x00, /* ....**...... */

- 0x04, 0x00, /* .....*...... */

- 0x06, 0x00, /* .....**..... */

- 0x07, 0xe0, /* .....******. */

- 0x4f, 0xe0, /* .*..*******. */

- 0x7e, 0x60, /* .******..**. */

- 0x76, 0x60, /* .***.**..**. */

- 0x06, 0x60, /* .....**..**. */

- 0x04, 0x60, /* .....*...**. */

- 0x0c, 0x60, /* ....**...**. */

- 0x0c, 0x40, /* ....**...*.. */

- 0x08, 0x40, /* ....*....*.. */

- 0x1a, 0x40, /* ...**.*..*.. */

- 0x13, 0xc0, /* ...*..****.. */

- 0x31, 0x80, /* ..**...**... */

- 0x61, 0x80, /* .**....**... */

- 0x60, 0x00, /* .**......... */

- 0x00, 0x00, /* ............ */

- /* 0xF7 */

- 0x00, 0x00, /* ............ */

- 0x08, 0x00, /* ....*....... */

- 0x0c, 0x00, /* ....**...... */

- 0x04, 0x00, /* .....*...... */

- 0x07, 0xc0, /* .....*****.. */

- 0x5f, 0xc0, /* .*.*******.. */

- 0x7e, 0x00, /* .******..... */

- 0x26, 0x00, /* ..*..**..... */

- 0x06, 0x00, /* .....**..... */

- 0x06, 0xf0, /* .....**.**** */

- 0x0f, 0xf0, /* ....******** */

- 0xff, 0x00, /* ********.... */

- 0x7a, 0x00, /* .****.*..... */

- 0x02, 0x00, /* ......*..... */

- 0x00, 0x00, /* ............ */

- /* 0xF8 */

- 0x00, 0x00, /* ............ */

- 0x06, 0x00, /* .....**..... */

- 0x04, 0x40, /* .....*...*.. */

- 0x0f, 0xe0, /* ....*******. */

- 0x08, 0x40, /* ....*....*.. */

- 0x18, 0xc0, /* ...**...**.. */

- 0x10, 0x80, /* ...*....*... */

- 0x30, 0x80, /* ..**....*... */

- 0x21, 0x80, /* ..*....**... */

- 0x61, 0x00, /* .**....*.... */

- 0x41, 0x00, /* .*.....*.... */

- 0x03, 0x00, /* ......**.... */

- 0x02, 0x00, /* ......*..... */

- 0x06, 0x00, /* .....**..... */

- 0x0c, 0x00, /* ....**...... */

- 0x18, 0x00, /* ...**....... */

- 0x30, 0x00, /* ..**........ */

- 0x60, 0x00, /* .**......... */

- 0x00, 0x00, /* ............ */

- /* 0xF9 */

- 0x00, 0x00, /* ............ */

- 0x08, 0x00, /* ....*....... */

- 0x0c, 0x00, /* ....**...... */

- 0x08, 0x00, /* ....*....... */

- 0x19, 0xf0, /* ...**..***** */

- 0x1f, 0xf0, /* ...********* */

- 0x1f, 0x00, /* ...*****.... */

- 0x33, 0x00, /* ..**..**.... */

- 0x23, 0x00, /* ..*...**.... */

- 0x63, 0x00, /* .**...**.... */

- 0x43, 0x00, /* .*....**.... */

- 0x02, 0x00, /* ......*..... */

- 0x06, 0x00, /* .....**..... */

- 0x04, 0x00, /* .....*...... */

- 0x0c, 0x00, /* ....**...... */

- 0x08, 0x00, /* ....*....... */

- 0x18, 0x00, /* ...**....... */

- 0x10, 0x00, /* ...*........ */

- 0x00, 0x00, /* ............ */

- /* 0xFA */

- 0x00, 0x00, /* ............ */

- 0x60, 0x40, /* .**......*.. */

- 0x3f, 0xe0, /* ..*********. */

- 0x00, 0x40, /* .........*.. */

- 0x00, 0xc0, /* ........**.. */

- 0x7f, 0xc0, /* .*********.. */

- 0x3f, 0xc0, /* ..********.. */

- 0x00, 0x00, /* ............ */

- /* 0xFB */

- 0x00, 0x00, /* ............ */

- 0x01, 0x00, /* .......*.... */

- 0x01, 0x80, /* .......**... */

- 0x31, 0x80, /* ..**...**... */

- 0x19, 0x80, /* ...**..**... */

- 0x19, 0xe0, /* ...**..****. */

- 0x7f, 0xf0, /* .*********** */

- 0x7f, 0x80, /* .********... */

- 0x19, 0x80, /* ...**..**... */

- 0x19, 0x00, /* ...**..*.... */

- 0x01, 0x00, /* .......*.... */

- 0x03, 0x00, /* ......**.... */

- 0x02, 0x00, /* ......*..... */

- 0x06, 0x00, /* .....**..... */

- 0x0c, 0x00, /* ....**...... */

- 0x00, 0x00, /* ............ */

- /* 0xFC */

- 0x00, 0x00, /* ............ */

- 0x30, 0x00, /* ..**........ */

- 0x10, 0x00, /* ...*........ */

- 0x18, 0x00, /* ...**....... */

- 0x08, 0x00, /* ....*....... */

- 0x00, 0x10, /* ...........* */

- 0x40, 0x30, /* .*........** */

- 0x60, 0x20, /* .**.......*. */

- 0x30, 0x60, /* ..**.....**. */

- 0x18, 0x40, /* ...**....*.. */

- 0x18, 0xc0, /* ...**...**.. */

- 0x00, 0x80, /* ........*... */

- 0x01, 0x80, /* .......**... */

- 0x01, 0x00, /* .......*.... */

- 0x03, 0x00, /* ......**.... */

- 0x06, 0x00, /* .....**..... */

- 0x2c, 0x00, /* ..*.**...... */

- 0x3c, 0x00, /* ..****...... */

- 0x38, 0x00, /* ..***....... */

- 0x18, 0x00, /* ...**....... */

- 0x00, 0x00, /* ............ */

- /* 0xFD */

- 0x00, 0x00, /* ............ */

- 0x21, 0xc0, /* ..*....***.. */

- 0x3f, 0xe0, /* ..*********. */

- 0x1e, 0x40, /* ...****..*.. */

- 0x00, 0x40, /* .........*.. */

- 0x00, 0xc0, /* ........**.. */

- 0x00, 0x80, /* ........*... */

- 0x01, 0x80, /* .......**... */

- 0x01, 0x00, /* .......*.... */

- 0x03, 0x00, /* ......**.... */

- 0x02, 0x00, /* ......*..... */

- 0x07, 0x80, /* .....****... */

- 0x05, 0x80, /* .....*.**... */

- 0x0c, 0xc0, /* ....**..**.. */

- 0x08, 0x40, /* ....*....*.. */

- 0x18, 0x60, /* ...**....**. */

- 0x30, 0x60, /* ..**.....**. */

- 0x60, 0x20, /* .**.......*. */

- 0x60, 0x00, /* .**......... */

- 0x00, 0x00, /* ............ */

- /* 0xFE */

- 0x00, 0x00, /* ............ */

- 0x08, 0x00, /* ....*....... */

- 0x0c, 0x00, /* ....**...... */

- 0x0c, 0x20, /* ....**....*. */

- 0x0f, 0xf0, /* ....******** */

- 0x9f, 0xe0, /* *..********. */

- 0xfc, 0x40, /* ******...*.. */

- 0x6c, 0xc0, /* .**.**..**.. */

- 0x0c, 0x80, /* ....**..*... */

- 0x0d, 0x80, /* ....**.**... */

- 0x0d, 0x00, /* ....**.*.... */

- 0x0f, 0x00, /* ....****.... */

- 0x0c, 0x00, /* ....**...... */

- 0x07, 0xf0, /* .....******* */

- 0x00, 0x00, /* ............ */

- /* 0xFF */

- 0x00, 0x00, /* ............ */

- 0x20, 0xc0, /* ..*.....**.. */

- 0x20, 0x60, /* ..*......**. */

- 0x30, 0x40, /* ..**.....*.. */

- 0x10, 0x40, /* ...*.....*.. */

- 0x18, 0xc0, /* ...**...**.. */

- 0x18, 0x80, /* ...**...*... */

- 0x00, 0x80, /* ........*... */

- 0x01, 0x80, /* .......**... */

- 0x01, 0x00, /* .......*.... */

- 0x03, 0x00, /* ......**.... */

- 0x02, 0x00, /* ......*..... */

- 0x06, 0x00, /* .....**..... */

- 0x04, 0x00, /* .....*...... */

- 0x0c, 0x00, /* ....**...... */

- 0x08, 0x00, /* ....*....... */

- 0x18, 0x00, /* ...**....... */

- 0x10, 0x00, /* ...*........ */

- 0x00, 0x00, /* ............ */

};

diff --git a/sys/dev/wsfont/sony8x16.h b/sys/dev/wsfont/sony8x16.h
index aee850b9ddd..f49dd9c7fe7 100644
--- a/sys/dev/wsfont/sony8x16.h
+++ b/sys/dev/wsfont/sony8x16.h

@@ -1,5 +1,5 @@

-/* $OpenBSD: sony8x16.h,v 1.2 2003/06/02 23:28:05 millert Exp $ */

-/* $NetBSD: sony8x16.h,v 1.1 2000/11/21 11:44:45 tsutsui Exp $ */

+/* $OpenBSD: sony8x16.h,v 1.3 2006/08/06 16:00:46 miod Exp $ */

+/* $NetBSD: sony8x16.h,v 1.8 2005/12/11 12:24:12 christos Exp $ */

@@ -38,14 +38,14 @@

/* This font data is generated from sys/arch/newsmips/dev/fnt.c */

-extern u_char sony8x16_data[];

+static u_char sony8x16_data[];

struct wsdisplay_font sony8x16 = {

"sony8x16", /* typeface name */

0, /* index */

' ', /* firstchar */

0xff - ' ' + 1, /* numchars */

- WSDISPLAY_FONTENC_SONY, /* encoding */

+ WSDISPLAY_FONTENC_ISO, /* encoding */

8, /* width */

16, /* height */

1, /* stride */

@@ -2383,6 +2383,582 @@ static u_char sony8x16_data[] = {

/* 0x81 */

0x00, /* ........ */

+ 0x00, /* ........ */

+ /* 0x82 */

+ 0x00, /* ........ */

+ /* 0x83 */

+ 0x00, /* ........ */

+ /* 0x84 */

+ 0x00, /* ........ */

+ /* 0x85 */

+ 0x00, /* ........ */

+ /* 0x86 */

+ 0x00, /* ........ */

+ /* 0x87 */

+ 0x00, /* ........ */

+ /* 0x88 */

+ 0x00, /* ........ */

+ /* 0x89 */

+ 0x00, /* ........ */

+ /* 0x8A */

+ 0x00, /* ........ */

+ /* 0x8B */

+ 0x00, /* ........ */

+ /* 0x8C */

+ 0x00, /* ........ */

+ /* 0x8D */

+ 0x00, /* ........ */

+ /* 0x8E */

+ 0x00, /* ........ */

+ /* 0x8F */

+ 0x00, /* ........ */

+ /* 0x90 */

+ 0x00, /* ........ */

+ /* 0x91 */

+ 0x00, /* ........ */

+ /* 0x92 */

+ 0x00, /* ........ */

+ /* 0x93 */

+ 0x00, /* ........ */

+ /* 0x94 */

+ 0x00, /* ........ */

+ /* 0x95 */

+ 0x00, /* ........ */

+ /* 0x96 */

+ 0x00, /* ........ */

+ /* 0x97 */

+ 0x00, /* ........ */

+ /* 0x98 */

+ 0x00, /* ........ */

+ /* 0x99 */

+ 0x00, /* ........ */

+ /* 0x9A */

+ 0x00, /* ........ */

+ /* 0x9B */

+ 0x00, /* ........ */

+ /* 0x9C */

+ 0x00, /* ........ */

+ /* 0x9D */

+ 0x00, /* ........ */

+ /* 0x9E */

+ 0x00, /* ........ */

+ /* 0x9F */

+ 0x00, /* ........ */

+ /* 0xA0 */

+ 0x00, /* ........ */

+ /* 0xA1 */

+ 0x00, /* ........ */

0x10, /* ...*.... */

0x38, /* ..***... */

0x10, /* ...*.... */

@@ -2399,7 +2975,7 @@ static u_char sony8x16_data[] = {

0x38, /* ..***... */

- /* 0x82 */

+ /* 0xA2 */

0x00, /* ........ */

0x10, /* ...*.... */

@@ -2417,7 +2993,7 @@ static u_char sony8x16_data[] = {

0x10, /* ...*.... */

0x00, /* ........ */

- /* 0x83 */

+ /* 0xA3 */

0x00, /* ........ */

@@ -2435,7 +3011,7 @@ static u_char sony8x16_data[] = {

0x20, /* ..*..... */

0x00, /* ........ */

- /* 0x84 */

+ /* 0xA4 */

0x00, /* ........ */

@@ -2453,7 +3029,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x85 */

+ /* 0xA5 */

0x82, /* *.....*. */

0x44, /* .*...*.. */

@@ -2471,7 +3047,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x86 */

+ /* 0xA6 */

0x00, /* ........ */

0x10, /* ...*.... */

@@ -2489,7 +3065,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x87 */

+ /* 0xA7 */

0x00, /* ........ */

0x3c, /* ..****.. */

0x42, /* .*....*. */

@@ -2507,7 +3083,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x88 */

+ /* 0xA8 */

0x00, /* ........ */

0x24, /* ..*..*.. */

@@ -2525,7 +3101,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x89 */

+ /* 0xA9 */

0x00, /* ........ */

0x3c, /* ..****.. */

0x42, /* .*....*. */

@@ -2543,7 +3119,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x8A */

+ /* 0xAA */

0x00, /* ........ */

0x1c, /* ...***.. */

0x22, /* ..*...*. */

@@ -2561,7 +3137,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x8B */

+ /* 0xAB */

0x00, /* ........ */

0x12, /* ...*..*. */

@@ -2579,7 +3155,7 @@ static u_char sony8x16_data[] = {

0x12, /* ...*..*. */

0x00, /* ........ */

- /* 0x8C */

+ /* 0xAC */

0x00, /* ........ */

@@ -2597,7 +3173,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x8D */

+ /* 0xAD */

0x00, /* ........ */

@@ -2615,7 +3191,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x8E */

+ /* 0xAE */

0x00, /* ........ */

0x3c, /* ..****.. */

0x42, /* .*....*. */

@@ -2633,7 +3209,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x8F */

+ /* 0xAF */

0x00, /* ........ */

0xfe, /* *******. */

@@ -2651,7 +3227,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x90 */

+ /* 0xB0 */

0x00, /* ........ */

0x38, /* ..***... */

0x44, /* .*...*.. */

@@ -2669,7 +3245,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x91 */

+ /* 0xB1 */

0x00, /* ........ */

@@ -2687,7 +3263,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x92 */

+ /* 0xB2 */

0x00, /* ........ */

0x18, /* ...**... */

0x24, /* ..*..*.. */

@@ -2705,7 +3281,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x93 */

+ /* 0xB3 */

0x00, /* ........ */

0x18, /* ...**... */

0x24, /* ..*..*.. */

@@ -2723,7 +3299,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x94 */

+ /* 0xB4 */

0x00, /* ........ */

0x0c, /* ....**.. */

0x18, /* ...**... */

@@ -2741,7 +3317,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x95 */

+ /* 0xB5 */

0x00, /* ........ */

@@ -2759,7 +3335,7 @@ static u_char sony8x16_data[] = {

0x82, /* *.....*. */

0x80, /* *....... */

- /* 0x96 */

+ /* 0xB6 */

0x00, /* ........ */

0x7f, /* .******* */

0xfa, /* *****.*. */

@@ -2777,7 +3353,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x97 */

+ /* 0xB7 */

0x00, /* ........ */

@@ -2795,7 +3371,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x98 */

+ /* 0xB8 */

0x00, /* ........ */

@@ -2813,7 +3389,7 @@ static u_char sony8x16_data[] = {

0x08, /* ....*... */

0x10, /* ...*.... */

- /* 0x99 */

+ /* 0xB9 */

0x00, /* ........ */

0x08, /* ....*... */

0x18, /* ...**... */

@@ -2831,7 +3407,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x9A */

+ /* 0xBA */

0x00, /* ........ */

0x18, /* ...**... */

0x24, /* ..*..*.. */

@@ -2849,7 +3425,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x9B */

+ /* 0xBB */

0x00, /* ........ */

0x48, /* .*..*... */

@@ -2867,7 +3443,7 @@ static u_char sony8x16_data[] = {

0x48, /* .*..*... */

0x00, /* ........ */

- /* 0x9C */

+ /* 0xBC */

0x00, /* ........ */

0x40, /* .*...... */

0xc0, /* **...... */

@@ -2885,7 +3461,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x9D */

+ /* 0xBD */

0x00, /* ........ */

0x40, /* .*...... */

0xc0, /* **...... */

@@ -2903,7 +3479,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x9E */

+ /* 0xBE */

0x00, /* ........ */

0x60, /* .**..... */

0x90, /* *..*.... */

@@ -2921,7 +3497,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0x9F */

+ /* 0xBF */

0x08, /* ....*... */

0x1c, /* ...***.. */

0x08, /* ....*... */

@@ -2939,7 +3515,7 @@ static u_char sony8x16_data[] = {

0x1c, /* ...***.. */

0x00, /* ........ */

- /* 0xA0 */

+ /* 0xC0 */

0x30, /* ..**.... */

0x10, /* ...*.... */

0x08, /* ....*... */

@@ -2957,7 +3533,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xA1 */

+ /* 0xC1 */

0x18, /* ...**... */

0x10, /* ...*.... */

0x20, /* ..*..... */

@@ -2975,7 +3551,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xA2 */

+ /* 0xC2 */

0x10, /* ...*.... */

0x28, /* ..*.*... */

0x44, /* .*...*.. */

@@ -2993,7 +3569,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xA3 */

+ /* 0xC3 */

0x24, /* ..*..*.. */

0x58, /* .*.**... */

0x00, /* ........ */

@@ -3011,7 +3587,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xA4 */

+ /* 0xC4 */

0x44, /* .*...*.. */

0x00, /* ........ */

@@ -3029,7 +3605,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xA5 */

+ /* 0xC5 */

0x38, /* ..***... */

0x44, /* .*...*.. */

0x38, /* ..***... */

@@ -3047,7 +3623,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xA6 */

+ /* 0xC6 */

0x00, /* ........ */

0x1f, /* ...***** */

@@ -3065,7 +3641,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xA7 */

+ /* 0xC7 */

0x00, /* ........ */

0x3c, /* ..****.. */

0x42, /* .*....*. */

@@ -3083,7 +3659,7 @@ static u_char sony8x16_data[] = {

0x08, /* ....*... */

0x10, /* ...*.... */

- /* 0xA8 */

+ /* 0xC8 */

0x30, /* ..**.... */

0x10, /* ...*.... */

0x08, /* ....*... */

@@ -3101,7 +3677,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xA9 */

+ /* 0xC9 */

0x18, /* ...**... */

0x10, /* ...*.... */

0x20, /* ..*..... */

@@ -3119,7 +3695,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xAA */

+ /* 0xCA */

0x30, /* ..**.... */

0x48, /* .*..*... */

0x00, /* ........ */

@@ -3137,7 +3713,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xAB */

+ /* 0xCB */

0x44, /* .*...*.. */

0x00, /* ........ */

@@ -3155,7 +3731,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xAC */

+ /* 0xCC */

0x30, /* ..**.... */

0x10, /* ...*.... */

0x08, /* ....*... */

@@ -3173,7 +3749,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xAD */

+ /* 0xCD */

0x18, /* ...**... */

0x10, /* ...*.... */

0x20, /* ..*..... */

@@ -3191,7 +3767,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xAE */

+ /* 0xCE */

0x10, /* ...*.... */

0x28, /* ..*.*... */

0x44, /* .*...*.. */

@@ -3209,7 +3785,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xAF */

+ /* 0xCF */

0x44, /* .*...*.. */

0x00, /* ........ */

@@ -3227,7 +3803,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xB0 */

+ /* 0xD0 */

0x00, /* ........ */

0xf8, /* *****... */

0x44, /* .*...*.. */

@@ -3245,7 +3821,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xB1 */

+ /* 0xD1 */

0x24, /* ..*..*.. */

0x58, /* .*.**... */

0x00, /* ........ */

@@ -3263,7 +3839,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xB2 */

+ /* 0xD2 */

0x30, /* ..**.... */

0x10, /* ...*.... */

0x08, /* ....*... */

@@ -3281,7 +3857,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xB3 */

+ /* 0xD3 */

0x18, /* ...**... */

0x10, /* ...*.... */

0x20, /* ..*..... */

@@ -3299,7 +3875,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xB4 */

+ /* 0xD4 */

0x38, /* ..***... */

0x44, /* .*...*.. */

0x00, /* ........ */

@@ -3317,7 +3893,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xB5 */

+ /* 0xD5 */

0x24, /* ..*..*.. */

0x58, /* .*.**... */

0x00, /* ........ */

@@ -3335,7 +3911,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xB6 */

+ /* 0xD6 */

0x44, /* .*...*.. */

0x00, /* ........ */

@@ -3353,7 +3929,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xB7 */

+ /* 0xD7 */

0x00, /* ........ */

@@ -3371,7 +3947,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xB8 */

+ /* 0xD8 */

0x02, /* ......*. */

0x3c, /* ..****.. */

@@ -3389,7 +3965,7 @@ static u_char sony8x16_data[] = {

0x80, /* *....... */

- /* 0xB9 */

+ /* 0xD9 */

0x30, /* ..**.... */

0x10, /* ...*.... */

0x08, /* ....*... */

@@ -3407,7 +3983,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xBA */

+ /* 0xDA */

0x0c, /* ....**.. */

0x08, /* ....*... */

0x10, /* ...*.... */

@@ -3425,7 +4001,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xBB */

+ /* 0xDB */

0x18, /* ...**... */

0x24, /* ..*..*.. */

0x00, /* ........ */

@@ -3443,7 +4019,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xBC */

+ /* 0xDC */

0x24, /* ..*..*.. */

0x00, /* ........ */

@@ -3461,7 +4037,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xBD */

+ /* 0xDD */

0x0c, /* ....**.. */

0x08, /* ....*... */

0x10, /* ...*.... */

@@ -3479,7 +4055,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xBE */

+ /* 0xDE */

0xe0, /* ***..... */

0x40, /* .*...... */

0x78, /* .****... */

@@ -3497,7 +4073,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xBF */

+ /* 0xDF */

0x00, /* ........ */

0x38, /* ..***... */

0x44, /* .*...*.. */

@@ -3515,7 +4091,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xC0 */

+ /* 0xE0 */

0x00, /* ........ */

0x30, /* ..**.... */

0x10, /* ...*.... */

@@ -3533,7 +4109,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xC1 */

+ /* 0xE1 */

0x00, /* ........ */

0x18, /* ...**... */

0x10, /* ...*.... */

@@ -3551,7 +4127,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xC2 */

+ /* 0xE2 */

0x00, /* ........ */

0x18, /* ...**... */

0x24, /* ..*..*.. */

@@ -3569,7 +4145,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xC3 */

+ /* 0xE3 */

0x00, /* ........ */

0x32, /* ..**..*. */

0x4c, /* .*..**.. */

@@ -3587,7 +4163,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xC4 */

+ /* 0xE4 */

0x00, /* ........ */

0x24, /* ..*..*.. */

@@ -3605,7 +4181,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xC5 */

+ /* 0xE5 */

0x00, /* ........ */

0x18, /* ...**... */

0x24, /* ..*..*.. */

@@ -3623,7 +4199,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xC6 */

+ /* 0xE6 */

0x00, /* ........ */

@@ -3641,7 +4217,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xC7 */

+ /* 0xE7 */

0x00, /* ........ */

@@ -3659,7 +4235,7 @@ static u_char sony8x16_data[] = {

0x10, /* ...*.... */

0x20, /* ..*..... */

- /* 0xC8 */

+ /* 0xE8 */

0x00, /* ........ */

0x30, /* ..**.... */

0x10, /* ...*.... */

@@ -3677,7 +4253,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xC9 */

+ /* 0xE9 */

0x00, /* ........ */

0x18, /* ...**... */

0x10, /* ...*.... */

@@ -3695,7 +4271,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xCA */

+ /* 0xEA */

0x00, /* ........ */

0x38, /* ..***... */

0x44, /* .*...*.. */

@@ -3713,7 +4289,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xCB */

+ /* 0xEB */

0x00, /* ........ */

0x44, /* .*...*.. */

@@ -3731,7 +4307,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xCC */

+ /* 0xEC */

0x00, /* ........ */

0x30, /* ..**.... */

0x10, /* ...*.... */

@@ -3749,7 +4325,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xCD */

+ /* 0xED */

0x00, /* ........ */

0x18, /* ...**... */

0x10, /* ...*.... */

@@ -3767,7 +4343,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xCE */

+ /* 0xEE */

0x00, /* ........ */

0x18, /* ...**... */

0x24, /* ..*..*.. */

@@ -3785,7 +4361,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xCF */

+ /* 0xEF */

0x00, /* ........ */

0x24, /* ..*..*.. */

@@ -3803,7 +4379,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xD0 */

+ /* 0xF0 */

0x00, /* ........ */

0x64, /* .**..*.. */

0x18, /* ...**... */

@@ -3821,7 +4397,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xD1 */

+ /* 0xF1 */

0x00, /* ........ */

0x32, /* ..**..*. */

0x4c, /* .*..**.. */

@@ -3839,7 +4415,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xD2 */

+ /* 0xF2 */

0x00, /* ........ */

0x30, /* ..**.... */

0x10, /* ...*.... */

@@ -3857,7 +4433,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xD3 */

+ /* 0xF3 */

0x00, /* ........ */

0x18, /* ...**... */

0x10, /* ...*.... */

@@ -3875,7 +4451,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xD4 */

+ /* 0xF4 */

0x00, /* ........ */

0x10, /* ...*.... */

0x28, /* ..*.*... */

@@ -3893,7 +4469,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xD5 */

+ /* 0xF5 */

0x00, /* ........ */

0x32, /* ..**..*. */

0x4c, /* .*..**.. */

@@ -3911,7 +4487,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xD6 */

+ /* 0xF6 */

0x00, /* ........ */

0x44, /* .*...*.. */

@@ -3929,7 +4505,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xD7 */

+ /* 0xF7 */

0x00, /* ........ */

@@ -3947,7 +4523,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xD8 */

+ /* 0xF8 */

0x00, /* ........ */

@@ -3965,7 +4541,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xD9 */

+ /* 0xF9 */

0x00, /* ........ */

0x30, /* ..**.... */

0x10, /* ...*.... */

@@ -3983,7 +4559,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xDA */

+ /* 0xFA */

0x00, /* ........ */

0x18, /* ...**... */

0x10, /* ...*.... */

@@ -4001,7 +4577,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xDB */

+ /* 0xFB */

0x00, /* ........ */

0x10, /* ...*.... */

0x28, /* ..*.*... */

@@ -4019,7 +4595,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xDC */

+ /* 0xFC */

0x00, /* ........ */

0x24, /* ..*..*.. */

@@ -4037,7 +4613,7 @@ static u_char sony8x16_data[] = {

0x00, /* ........ */

- /* 0xDD */

+ /* 0xFD */

0x00, /* ........ */

0x0c, /* ....**.. */

0x08, /* ....*... */

@@ -4055,7 +4631,7 @@ static u_char sony8x16_data[] = {

0xa0, /* *.*..... */

0x40, /* .*...... */

- /* 0xDE */

+ /* 0xFE */

0x00, /* ........ */

0xc0, /* **...... */

@@ -4073,7 +4649,7 @@ static u_char sony8x16_data[] = {

0x40, /* .*...... */

0xf0, /* ****.... */

- /* 0xDF */

+ /* 0xFF */

0x00, /* ........ */

0x24, /* ..*..*.. */

@@ -4090,580 +4666,4 @@ static u_char sony8x16_data[] = {

0x90, /* *..*.... */

0xa0, /* *.*..... */

0x40, /* .*...... */

- /* 0xE0 */

- 0x00, /* ........ */

- /* 0xE1 */

- 0x00, /* ........ */

- 0x20, /* ..*..... */

- 0x50, /* .*.*.... */

- 0x20, /* ..*..... */

- /* 0xE2 */

- 0x1e, /* ...****. */

- 0x10, /* ...*.... */

- 0x00, /* ........ */

- /* 0xE3 */

- 0x00, /* ........ */

- 0x04, /* .....*.. */

- 0x3c, /* ..****.. */

- /* 0xE4 */

- 0x00, /* ........ */

- 0x40, /* .*...... */

- 0x20, /* ..*..... */

- /* 0xE5 */

- 0x00, /* ........ */

- 0x18, /* ...**... */

- 0x00, /* ........ */

- /* 0xE6 */

- 0x00, /* ........ */

- 0x7e, /* .******. */

- 0x02, /* ......*. */

- 0x7e, /* .******. */

- 0x02, /* ......*. */

- 0x06, /* .....**. */

- 0x04, /* .....*.. */

- 0x0c, /* ....**.. */

- 0x08, /* ....*... */

- 0x18, /* ...**... */

- 0x30, /* ..**.... */

- 0x00, /* ........ */

- /* 0xE7 */

- 0x00, /* ........ */

- 0x7e, /* .******. */

- 0x02, /* ......*. */

- 0x16, /* ...*.**. */

- 0x14, /* ...*.*.. */

- 0x10, /* ...*.... */

- 0x30, /* ..**.... */

- 0x20, /* ..*..... */

- /* 0xE8 */

- 0x00, /* ........ */

- 0x02, /* ......*. */

- 0x04, /* .....*.. */

- 0x08, /* ....*... */

- 0x18, /* ...**... */

- 0x68, /* .**.*... */

- 0x08, /* ....*... */

- /* 0xE9 */

- 0x00, /* ........ */

- 0x10, /* ...*.... */

- 0x7e, /* .******. */

- 0x42, /* .*....*. */

- 0x02, /* ......*. */

- 0x04, /* .....*.. */

- 0x08, /* ....*... */

- 0x10, /* ...*.... */

- 0x20, /* ..*..... */

- /* 0xEA */

- 0x00, /* ........ */

- 0x7c, /* .*****.. */

- 0x10, /* ...*.... */

- 0x7e, /* .******. */

- 0x00, /* ........ */

- /* 0xEB */

- 0x00, /* ........ */

- 0x08, /* ....*... */

- 0x7e, /* .******. */

- 0x18, /* ...**... */

- 0x28, /* ..*.*... */

- 0x48, /* .*..*... */

- 0x08, /* ....*... */

- 0x18, /* ...**... */

- /* 0xEC */

- 0x00, /* ........ */

- 0x20, /* ..*..... */

- 0x22, /* ..*...*. */

- 0x16, /* ...*.**. */

- 0x1a, /* ...**.*. */

- 0x32, /* ..**..*. */

- 0x48, /* .*..*... */

- 0x08, /* ....*... */

- 0x04, /* .....*.. */

- /* 0xED */

- 0x00, /* ........ */

- 0x38, /* ..***... */

- 0x08, /* ....*... */

- 0x7e, /* .******. */

- 0x00, /* ........ */

- /* 0xEE */

- 0x00, /* ........ */

- 0x3c, /* ..****.. */

- 0x04, /* .....*.. */

- 0x3c, /* ..****.. */

- 0x04, /* .....*.. */

- 0x3c, /* ..****.. */

- 0x00, /* ........ */

- /* 0xEF */

- 0x00, /* ........ */

- 0x10, /* ...*.... */

- 0x52, /* .*.*..*. */

- 0x4a, /* .*..*.*. */

- 0x22, /* ..*...*. */

- 0x04, /* .....*.. */

- 0x08, /* ....*... */

- 0x10, /* ...*.... */

- 0x20, /* ..*..... */

- /* 0xF0 */

- 0x00, /* ........ */

- 0x3c, /* ..****.. */

- 0x00, /* ........ */

- /* 0xF1 */

- 0x00, /* ........ */

- 0xff, /* ******** */

- 0x01, /* .......* */

- 0x12, /* ...*..*. */

- 0x14, /* ...*.*.. */

- 0x10, /* ...*.... */

- 0x20, /* ..*..... */

- 0x40, /* .*...... */

- 0x00, /* ........ */

- /* 0xF2 */

- 0x00, /* ........ */

- 0x02, /* ......*. */

- 0x04, /* .....*.. */

- 0x08, /* ....*... */

- 0x18, /* ...**... */

- 0x28, /* ..*.*... */

- 0xc8, /* **..*... */

- 0x08, /* ....*... */

- 0x00, /* ........ */

- /* 0xF3 */

- 0x10, /* ...*.... */

- 0x7e, /* .******. */

- 0x42, /* .*....*. */

- 0x02, /* ......*. */

- 0x04, /* .....*.. */

- 0x08, /* ....*... */

- 0x10, /* ...*.... */

- 0x20, /* ..*..... */

- 0x00, /* ........ */

- /* 0xF4 */

- 0x00, /* ........ */

- 0x7e, /* .******. */

- 0x10, /* ...*.... */

- 0xff, /* ******** */

- 0x00, /* ........ */

- /* 0xF5 */

- 0x08, /* ....*... */

- 0xff, /* ******** */

- 0x08, /* ....*... */

- 0x18, /* ...**... */

- 0x28, /* ..*.*... */

- 0x48, /* .*..*... */

- 0x88, /* *...*... */

- 0x08, /* ....*... */

- 0x18, /* ...**... */

- 0x00, /* ........ */

- /* 0xF6 */

- 0x10, /* ...*.... */

- 0x7e, /* .******. */

- 0x12, /* ...*..*. */

- 0x22, /* ..*...*. */

- 0x42, /* .*....*. */

- 0x4e, /* .*..***. */

- 0x00, /* ........ */

- /* 0xF7 */

- 0x20, /* ..*..... */

- 0x16, /* ...*.**. */

- 0x18, /* ...**... */

- 0x30, /* ..**.... */

- 0xd0, /* **.*.... */

- 0x13, /* ...*..** */

- 0x0c, /* ....**.. */

- 0x38, /* ..***... */

- 0x68, /* .**.*... */

- 0x08, /* ....*... */

- 0x04, /* .....*.. */

- /* 0xF8 */

- 0x10, /* ...*.... */

- 0x1e, /* ...****. */

- 0x12, /* ...*..*. */

- 0x22, /* ..*...*. */

- 0x44, /* .*...*.. */

- 0x04, /* .....*.. */

- 0x08, /* ....*... */

- 0x10, /* ...*.... */

- 0x20, /* ..*..... */

- 0x40, /* .*...... */

- 0x00, /* ........ */

- /* 0xF9 */

- 0x20, /* ..*..... */

- 0x3f, /* ..****** */

- 0x44, /* .*...*.. */

- 0x84, /* *....*.. */

- 0x04, /* .....*.. */

- 0x08, /* ....*... */

- 0x10, /* ...*.... */

- 0x20, /* ..*..... */

- 0x00, /* ........ */

- /* 0xFA */

- 0x00, /* ........ */

- 0x7e, /* .******. */

- 0x02, /* ......*. */

- 0x7e, /* .******. */

- 0x00, /* ........ */

- /* 0xFB */

- 0x00, /* ........ */

- 0x24, /* ..*..*.. */

- 0xff, /* ******** */

- 0x24, /* ..*..*.. */

- 0x04, /* .....*.. */

- 0x08, /* ....*... */

- 0x10, /* ...*.... */

- 0x20, /* ..*..... */

- 0x00, /* ........ */

- /* 0xFC */

- 0x00, /* ........ */

- 0x20, /* ..*..... */

- 0x30, /* ..**.... */

- 0x10, /* ...*.... */

- 0x00, /* ........ */

- 0x41, /* .*.....* */

- 0x61, /* .**....* */

- 0x22, /* ..*...*. */

- 0x02, /* ......*. */

- 0x04, /* .....*.. */

- 0x08, /* ....*... */

- 0x10, /* ...*.... */

- 0x20, /* ..*..... */

- 0x40, /* .*...... */

- 0x00, /* ........ */

- /* 0xFD */

- 0x00, /* ........ */

- 0x7c, /* .*****.. */

- 0x04, /* .....*.. */

- 0x08, /* ....*... */

- 0x18, /* ...**... */

- 0x14, /* ...*.*.. */

- 0x24, /* ..*..*.. */

- 0x22, /* ..*...*. */

- 0x42, /* .*....*. */

- 0x81, /* *......* */

- 0x00, /* ........ */

- /* 0xFE */

- 0x00, /* ........ */

- 0x20, /* ..*..... */

- 0x2e, /* ..*.***. */

- 0x32, /* ..**..*. */

- 0xe2, /* ***...*. */

- 0x24, /* ..*..*.. */

- 0x20, /* ..*..... */

- 0x3e, /* ..*****. */

- 0x00, /* ........ */

- /* 0xFF */

- 0x00, /* ........ */

- 0x42, /* .*....*. */

- 0x22, /* ..*...*. */

- 0x02, /* ......*. */

- 0x04, /* .....*.. */

- 0x08, /* ....*... */

- 0x10, /* ...*.... */

- 0x20, /* ..*..... */

- 0x00, /* ........ */

};

diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c
index f2f99947274..35fcafa5880 100644
--- a/sys/dev/wsfont/wsfont.c
+++ b/sys/dev/wsfont/wsfont.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: wsfont.c,v 1.19 2006/08/06 13:04:33 miod Exp $ */

+/* $OpenBSD: wsfont.c,v 1.20 2006/08/06 16:00:46 miod Exp $ */

/* $NetBSD: wsfont.c,v 1.17 2001/02/07 13:59:24 ad Exp $ */

/*-

@@ -817,65 +817,14 @@ static struct wsfont_level2_glyphmap *iso7_level1[] = {

};

-/*

- * SONY maps

- */

-static u_int8_t

-sony_chars_0[] = {

- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,

- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,

- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,

- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,

- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,

- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,

- 96, 97, 98, 99, 100,101,102,103,104,105,106,107,108,109,110,111,

- 112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,

- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

- 128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,

- 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,

- 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,

- 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,

- 192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,

- 208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223

-};

-static u_int16_t

-sony_chars_255[] = {

- 225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,

- 241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,

- 257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,

- 273,274,275,276,277,278,279,280,281,282,283,284,285,286,287

-};

-static struct wsfont_level2_glyphmap

-sony_level2_0 = { 0, 256, sony_chars_0, 1 },

-sony_level2_255 = { 97, 63, sony_chars_255, 2 };

-static struct wsfont_level2_glyphmap *sony_level1[] = {

- &sony_level2_0, NULL, NULL, NULL,

- NULL, NULL, NULL, NULL,

- null16, null16, null16, null16,

- null16, null16,

- NULL, NULL, NULL, NULL,

- NULL, NULL, NULL, &sony_level2_255

-};

static struct wsfont_level1_glyphmap encodings[] = {

{ NULL, 0, 0 }, /* WSDISPLAY_FONTENC_ISO */

{ ibm437_level1, 0, 38 }, /* WSDISPLAY_FONTENC_IBM */

{ NULL, 0, 0 }, /* WSDISPLAY_FONTENC_PCVT */

{ iso7_level1, 0, 33 }, /* WSDISPLAY_FONTENC_ISO7 */

- { sony_level1, 0, 256 }, /* WSDISPLAY_FONTENC_SONY */

};

-#define MAX_ENCODING WSDISPLAY_FONTENC_SONY

+#define MAX_ENCODING (sizeof(encodings) / sizeof(encodings[0]))

#endif /* !SMALL_KERNEL */

@@ -903,20 +852,20 @@ wsfont_map_unichar(font, c)

map1->level2[hi - map1->base];

if (map2 != NULL &&

- lo >= map2->base && hi < map2->base + map2->size) {

+ lo >= map2->base && lo < map2->base + map2->size) {

lo -= map2->base;

switch(map2->width) {

- case 1:

- c = (((u_int8_t *)map2->chars)[lo]);

- break;

- case 2:

- c = (((u_int16_t *)map2->chars)[lo]);

- break;

- case 4:

- c = (((u_int32_t *)map2->chars)[lo]);

- break;

+ case 1:

+ c = (((u_int8_t *)map2->chars)[lo]);

+ break;

+ case 2:

+ c = (((u_int16_t *)map2->chars)[lo]);

+ break;

+ case 4:

+ c = (((u_int32_t *)map2->chars)[lo]);

+ break;

}

if (c == 0 && lo != 0)