Remove Unicode to ISO-8859-7 translation tables, they would only be used if

one were to use an ISO-8859-7-encoded font on a raster display, yet none of
the fonts the kernel chooses from uses this encoding.

1 files changed, 5 insertions, 54 deletions

diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c
index 995cc868d1a..6e97d4ef88a 100644
--- a/sys/dev/wsfont/wsfont.c
+++ b/sys/dev/wsfont/wsfont.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsfont.c,v 1.31 2013/05/21 16:31:19 miod Exp $ */
+/*	$OpenBSD: wsfont.c,v 1.32 2013/10/19 14:34:20 miod Exp $ */
 /*	$NetBSD: wsfont.c,v 1.17 2001/02/07 13:59:24 ad Exp $	*/
 
 /*-
@@ -713,60 +713,11 @@ static struct wsfont_level2_glyphmap *ibm437_level1[] = {
 	NULL, &ibm437_level2_37
 };
 
-/*
- * ISO-8859-7 maps
- */
-
-static u_int8_t
-iso7_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,
-	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, 0,  0, 163, 0,  0, 166,167,168,169, 0, 171,172,173, 0,  0,
-	176,177,178,179,180, 0,  0, 183, 0,  0,  0, 187, 0, 189
-},
-iso7_chars_3[] = {
-	182, 0, 184,185,186, 0, 188, 0, 190,191,192,193,194,195,196,197,
-	198,199,200,201,202,203,204,205,206,207,208,209, 0, 211,212,213,
-	214,215,216,217,218,219,220,221,222,223,224,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, 0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 181
-},
-iso7_chars_32[] = {
-	175, 0,  0,  0,  0, 162, 0, 161
-};
-
-static struct wsfont_level2_glyphmap
-iso7_level2_0 = { 0, 190, iso7_chars_0, 1 },
-iso7_level2_3 = { 134, 111, iso7_chars_3, 1 },
-iso7_level2_32 = { 20, 8, iso7_chars_32, 1 };
-
-static struct wsfont_level2_glyphmap *iso7_level1[] = {
-	&iso7_level2_0, NULL, NULL, &iso7_level2_3,
-	NULL, NULL, NULL, NULL,
-	NULL, NULL, NULL, NULL,
-	NULL, NULL, NULL, NULL,
-	NULL, NULL, NULL, NULL,
-	NULL, NULL, NULL, NULL,
-	NULL, NULL, NULL, NULL,
-	NULL, NULL, NULL, NULL,
-	&iso7_level2_32
-};
-
 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 */
+	/* WSDISPLAY_FONTENC_ISO */
+	{ NULL, 0, 0 },
+	/* WSDISPLAY_FONTENC_IBM */
+	{ ibm437_level1, 0, nitems(ibm437_level1) }
 };
 
 #endif	/* !SMALL_KERNEL */