diff options
| author | Toomas Soome <tsoome@me.com> | 2016-04-02 23:01:09 +0300 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2016-04-04 14:19:36 -0700 |
| commit | d1e631af56641f21cde1f1efe3a9623ff9d6ee7c (patch) | |
| tree | 134a575ccd36adb74ba313da3f0c18598bd9d55c | |
| parent | 9468939ef8704ee9aba7596c1e9ff9b059109cac (diff) | |
| download | illumos-joyent-d1e631af56641f21cde1f1efe3a9623ff9d6ee7c.tar.gz | |
6853 built in fonts are exposing internal data
Reviewed by: Marcel Telka <marcel@telka.sk>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Approved by: Robert Mustacchi <rm@joyent.com>
| -rw-r--r-- | usr/src/uts/common/io/12x22.c | 523 | ||||
| -rw-r--r-- | usr/src/uts/common/io/6x10.c | 940 | ||||
| -rw-r--r-- | usr/src/uts/common/io/7x14.c | 522 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/io/gfx_private/gfxp_vgatext.c | 21 | ||||
| -rw-r--r-- | usr/src/uts/intel/io/vgatext/bdf_to_c.awk | 16 | ||||
| -rw-r--r-- | usr/src/uts/intel/io/vgatext/vgatext.c | 8 |
6 files changed, 1014 insertions, 1016 deletions
diff --git a/usr/src/uts/common/io/12x22.c b/usr/src/uts/common/io/12x22.c index 56b7a05662..0efeaf386d 100644 --- a/usr/src/uts/common/io/12x22.c +++ b/usr/src/uts/common/io/12x22.c @@ -3,8 +3,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/param.h> /* for NULL */ #include <sys/font.h> @@ -15,7 +13,7 @@ /* COMMENT Originally a BSD vfont. */ /* FONT -Sun-Gallant-Demi-R-Normal--19-190-72-72-M-120-ISO8859-1 */ -unsigned char FONTDATA[] = { +static unsigned char FONTDATA_12x22[] = { /* 0x01 */ @@ -5015,268 +5013,267 @@ unsigned char FONTDATA[] = { }; -unsigned char *ENCODINGS[256] = { - FONTDATA+748, - FONTDATA+0, - FONTDATA+44, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+88, - FONTDATA+132, - FONTDATA+176, - FONTDATA+220, - FONTDATA+484, - FONTDATA+264, - FONTDATA+308, - FONTDATA+352, - FONTDATA+396, - FONTDATA+440, - FONTDATA+528, - FONTDATA+572, - FONTDATA+616, - FONTDATA+660, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+44+748, - FONTDATA+88+748, - FONTDATA+132+748, - FONTDATA+176+748, - FONTDATA+220+748, - FONTDATA+264+748, - FONTDATA+308+748, - FONTDATA+352+748, - FONTDATA+396+748, - FONTDATA+440+748, - FONTDATA+484+748, - FONTDATA+528+748, - FONTDATA+572+748, - FONTDATA+616+748, - FONTDATA+660+748, - FONTDATA+704+748, - FONTDATA+748+748, - FONTDATA+792+748, - FONTDATA+836+748, - FONTDATA+880+748, - FONTDATA+924+748, - FONTDATA+968+748, - FONTDATA+1012+748, - FONTDATA+1056+748, - FONTDATA+1100+748, - FONTDATA+1144+748, - FONTDATA+1188+748, - FONTDATA+1232+748, - FONTDATA+1276+748, - FONTDATA+1320+748, - FONTDATA+1364+748, - FONTDATA+1408+748, - FONTDATA+1452+748, - FONTDATA+1496+748, - FONTDATA+1540+748, - FONTDATA+1584+748, - FONTDATA+1628+748, - FONTDATA+1672+748, - FONTDATA+1716+748, - FONTDATA+1760+748, - FONTDATA+1804+748, - FONTDATA+1848+748, - FONTDATA+1892+748, - FONTDATA+1936+748, - FONTDATA+1980+748, - FONTDATA+2024+748, - FONTDATA+2068+748, - FONTDATA+2112+748, - FONTDATA+2156+748, - FONTDATA+2200+748, - FONTDATA+2244+748, - FONTDATA+2288+748, - FONTDATA+2332+748, - FONTDATA+2376+748, - FONTDATA+2420+748, - FONTDATA+2464+748, - FONTDATA+2508+748, - FONTDATA+2552+748, - FONTDATA+2596+748, - FONTDATA+2640+748, - FONTDATA+2684+748, - FONTDATA+2728+748, - FONTDATA+2772+748, - FONTDATA+2816+748, - FONTDATA+2860+748, - FONTDATA+2904+748, - FONTDATA+2948+748, - FONTDATA+2992+748, - FONTDATA+3036+748, - FONTDATA+3080+748, - FONTDATA+3124+748, - FONTDATA+3168+748, - FONTDATA+3212+748, - FONTDATA+3256+748, - FONTDATA+3300+748, - FONTDATA+3344+748, - FONTDATA+3388+748, - FONTDATA+3432+748, - FONTDATA+3476+748, - FONTDATA+3520+748, - FONTDATA+3564+748, - FONTDATA+3608+748, - FONTDATA+3652+748, - FONTDATA+3696+748, - FONTDATA+3740+748, - FONTDATA+3784+748, - FONTDATA+3828+748, - FONTDATA+3872+748, - FONTDATA+3916+748, - FONTDATA+3960+748, - FONTDATA+4004+748, - FONTDATA+4048+748, - FONTDATA+4092+748, - FONTDATA+4136+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+748, - FONTDATA+4180+748, - FONTDATA+4224+748, - FONTDATA+4268+748, - FONTDATA+4312+748, - FONTDATA+4356+748, - FONTDATA+4400+748, - FONTDATA+4444+748, - FONTDATA+4488+748, - FONTDATA+4532+748, - FONTDATA+4576+748, - FONTDATA+4620+748, - FONTDATA+4664+748, - FONTDATA+4708+748, - FONTDATA+4752+748, - FONTDATA+4796+748, - FONTDATA+4840+748, - FONTDATA+4884+748, - FONTDATA+4928+748, - FONTDATA+4972+748, - FONTDATA+5016+748, - FONTDATA+5060+748, - FONTDATA+5104+748, - FONTDATA+5148+748, - FONTDATA+5192+748, - FONTDATA+5236+748, - FONTDATA+5280+748, - FONTDATA+5324+748, - FONTDATA+5368+748, - FONTDATA+5412+748, - FONTDATA+5456+748, - FONTDATA+5500+748, - FONTDATA+5544+748, - FONTDATA+5588+748, - FONTDATA+5632+748, - FONTDATA+5676+748, - FONTDATA+5720+748, - FONTDATA+5764+748, - FONTDATA+5808+748, - FONTDATA+5852+748, - FONTDATA+5896+748, - FONTDATA+5940+748, - FONTDATA+5984+748, - FONTDATA+6028+748, - FONTDATA+6072+748, - FONTDATA+6116+748, - FONTDATA+6160+748, - FONTDATA+6204+748, - FONTDATA+6248+748, - FONTDATA+6292+748, - FONTDATA+6336+748, - FONTDATA+6380+748, - FONTDATA+6424+748, - FONTDATA+6468+748, - FONTDATA+6512+748, - FONTDATA+6556+748, - FONTDATA+6600+748, - FONTDATA+6644+748, - FONTDATA+6688+748, - FONTDATA+6732+748, - FONTDATA+6776+748, - FONTDATA+6820+748, - FONTDATA+6864+748, - FONTDATA+6908+748, - FONTDATA+6952+748, - FONTDATA+6996+748, - FONTDATA+7480+748, - FONTDATA+7084+748, - FONTDATA+7128+748, - FONTDATA+7172+748, - FONTDATA+7216+748, - FONTDATA+7260+748, - FONTDATA+7304+748, - FONTDATA+7348+748, - FONTDATA+7392+748, - FONTDATA+7436+748, - FONTDATA+7480+748, - FONTDATA+7524+748, - FONTDATA+7568+748, - FONTDATA+7612+748, - FONTDATA+7656+748, - FONTDATA+7700+748, - FONTDATA+7744+748, - FONTDATA+7788+748, - FONTDATA+7832+748, - FONTDATA+7876+748, - FONTDATA+7920+748, - FONTDATA+7964+748, - FONTDATA+8008+748, - FONTDATA+8052+748, - FONTDATA+8096+748, - FONTDATA+8140+748, - FONTDATA+8184+748, - FONTDATA+8228+748, - FONTDATA+8272+748, - FONTDATA+8316+748, - FONTDATA+8360+748, +static unsigned char *ENCODINGS_12x22[256] = { + FONTDATA_12x22+748, + FONTDATA_12x22+0, + FONTDATA_12x22+44, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+88, + FONTDATA_12x22+132, + FONTDATA_12x22+176, + FONTDATA_12x22+220, + FONTDATA_12x22+484, + FONTDATA_12x22+264, + FONTDATA_12x22+308, + FONTDATA_12x22+352, + FONTDATA_12x22+396, + FONTDATA_12x22+440, + FONTDATA_12x22+528, + FONTDATA_12x22+572, + FONTDATA_12x22+616, + FONTDATA_12x22+660, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+44+748, + FONTDATA_12x22+88+748, + FONTDATA_12x22+132+748, + FONTDATA_12x22+176+748, + FONTDATA_12x22+220+748, + FONTDATA_12x22+264+748, + FONTDATA_12x22+308+748, + FONTDATA_12x22+352+748, + FONTDATA_12x22+396+748, + FONTDATA_12x22+440+748, + FONTDATA_12x22+484+748, + FONTDATA_12x22+528+748, + FONTDATA_12x22+572+748, + FONTDATA_12x22+616+748, + FONTDATA_12x22+660+748, + FONTDATA_12x22+704+748, + FONTDATA_12x22+748+748, + FONTDATA_12x22+792+748, + FONTDATA_12x22+836+748, + FONTDATA_12x22+880+748, + FONTDATA_12x22+924+748, + FONTDATA_12x22+968+748, + FONTDATA_12x22+1012+748, + FONTDATA_12x22+1056+748, + FONTDATA_12x22+1100+748, + FONTDATA_12x22+1144+748, + FONTDATA_12x22+1188+748, + FONTDATA_12x22+1232+748, + FONTDATA_12x22+1276+748, + FONTDATA_12x22+1320+748, + FONTDATA_12x22+1364+748, + FONTDATA_12x22+1408+748, + FONTDATA_12x22+1452+748, + FONTDATA_12x22+1496+748, + FONTDATA_12x22+1540+748, + FONTDATA_12x22+1584+748, + FONTDATA_12x22+1628+748, + FONTDATA_12x22+1672+748, + FONTDATA_12x22+1716+748, + FONTDATA_12x22+1760+748, + FONTDATA_12x22+1804+748, + FONTDATA_12x22+1848+748, + FONTDATA_12x22+1892+748, + FONTDATA_12x22+1936+748, + FONTDATA_12x22+1980+748, + FONTDATA_12x22+2024+748, + FONTDATA_12x22+2068+748, + FONTDATA_12x22+2112+748, + FONTDATA_12x22+2156+748, + FONTDATA_12x22+2200+748, + FONTDATA_12x22+2244+748, + FONTDATA_12x22+2288+748, + FONTDATA_12x22+2332+748, + FONTDATA_12x22+2376+748, + FONTDATA_12x22+2420+748, + FONTDATA_12x22+2464+748, + FONTDATA_12x22+2508+748, + FONTDATA_12x22+2552+748, + FONTDATA_12x22+2596+748, + FONTDATA_12x22+2640+748, + FONTDATA_12x22+2684+748, + FONTDATA_12x22+2728+748, + FONTDATA_12x22+2772+748, + FONTDATA_12x22+2816+748, + FONTDATA_12x22+2860+748, + FONTDATA_12x22+2904+748, + FONTDATA_12x22+2948+748, + FONTDATA_12x22+2992+748, + FONTDATA_12x22+3036+748, + FONTDATA_12x22+3080+748, + FONTDATA_12x22+3124+748, + FONTDATA_12x22+3168+748, + FONTDATA_12x22+3212+748, + FONTDATA_12x22+3256+748, + FONTDATA_12x22+3300+748, + FONTDATA_12x22+3344+748, + FONTDATA_12x22+3388+748, + FONTDATA_12x22+3432+748, + FONTDATA_12x22+3476+748, + FONTDATA_12x22+3520+748, + FONTDATA_12x22+3564+748, + FONTDATA_12x22+3608+748, + FONTDATA_12x22+3652+748, + FONTDATA_12x22+3696+748, + FONTDATA_12x22+3740+748, + FONTDATA_12x22+3784+748, + FONTDATA_12x22+3828+748, + FONTDATA_12x22+3872+748, + FONTDATA_12x22+3916+748, + FONTDATA_12x22+3960+748, + FONTDATA_12x22+4004+748, + FONTDATA_12x22+4048+748, + FONTDATA_12x22+4092+748, + FONTDATA_12x22+4136+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+748, + FONTDATA_12x22+4180+748, + FONTDATA_12x22+4224+748, + FONTDATA_12x22+4268+748, + FONTDATA_12x22+4312+748, + FONTDATA_12x22+4356+748, + FONTDATA_12x22+4400+748, + FONTDATA_12x22+4444+748, + FONTDATA_12x22+4488+748, + FONTDATA_12x22+4532+748, + FONTDATA_12x22+4576+748, + FONTDATA_12x22+4620+748, + FONTDATA_12x22+4664+748, + FONTDATA_12x22+4708+748, + FONTDATA_12x22+4752+748, + FONTDATA_12x22+4796+748, + FONTDATA_12x22+4840+748, + FONTDATA_12x22+4884+748, + FONTDATA_12x22+4928+748, + FONTDATA_12x22+4972+748, + FONTDATA_12x22+5016+748, + FONTDATA_12x22+5060+748, + FONTDATA_12x22+5104+748, + FONTDATA_12x22+5148+748, + FONTDATA_12x22+5192+748, + FONTDATA_12x22+5236+748, + FONTDATA_12x22+5280+748, + FONTDATA_12x22+5324+748, + FONTDATA_12x22+5368+748, + FONTDATA_12x22+5412+748, + FONTDATA_12x22+5456+748, + FONTDATA_12x22+5500+748, + FONTDATA_12x22+5544+748, + FONTDATA_12x22+5588+748, + FONTDATA_12x22+5632+748, + FONTDATA_12x22+5676+748, + FONTDATA_12x22+5720+748, + FONTDATA_12x22+5764+748, + FONTDATA_12x22+5808+748, + FONTDATA_12x22+5852+748, + FONTDATA_12x22+5896+748, + FONTDATA_12x22+5940+748, + FONTDATA_12x22+5984+748, + FONTDATA_12x22+6028+748, + FONTDATA_12x22+6072+748, + FONTDATA_12x22+6116+748, + FONTDATA_12x22+6160+748, + FONTDATA_12x22+6204+748, + FONTDATA_12x22+6248+748, + FONTDATA_12x22+6292+748, + FONTDATA_12x22+6336+748, + FONTDATA_12x22+6380+748, + FONTDATA_12x22+6424+748, + FONTDATA_12x22+6468+748, + FONTDATA_12x22+6512+748, + FONTDATA_12x22+6556+748, + FONTDATA_12x22+6600+748, + FONTDATA_12x22+6644+748, + FONTDATA_12x22+6688+748, + FONTDATA_12x22+6732+748, + FONTDATA_12x22+6776+748, + FONTDATA_12x22+6820+748, + FONTDATA_12x22+6864+748, + FONTDATA_12x22+6908+748, + FONTDATA_12x22+6952+748, + FONTDATA_12x22+6996+748, + FONTDATA_12x22+7480+748, + FONTDATA_12x22+7084+748, + FONTDATA_12x22+7128+748, + FONTDATA_12x22+7172+748, + FONTDATA_12x22+7216+748, + FONTDATA_12x22+7260+748, + FONTDATA_12x22+7304+748, + FONTDATA_12x22+7348+748, + FONTDATA_12x22+7392+748, + FONTDATA_12x22+7436+748, + FONTDATA_12x22+7480+748, + FONTDATA_12x22+7524+748, + FONTDATA_12x22+7568+748, + FONTDATA_12x22+7612+748, + FONTDATA_12x22+7656+748, + FONTDATA_12x22+7700+748, + FONTDATA_12x22+7744+748, + FONTDATA_12x22+7788+748, + FONTDATA_12x22+7832+748, + FONTDATA_12x22+7876+748, + FONTDATA_12x22+7920+748, + FONTDATA_12x22+7964+748, + FONTDATA_12x22+8008+748, + FONTDATA_12x22+8052+748, + FONTDATA_12x22+8096+748, + FONTDATA_12x22+8140+748, + FONTDATA_12x22+8184+748, + FONTDATA_12x22+8228+748, + FONTDATA_12x22+8272+748, + FONTDATA_12x22+8316+748, + FONTDATA_12x22+8360+748, }; bitmap_data_t font_data_12x22 = { 12, 22, - FONTDATA, - ENCODINGS, + FONTDATA_12x22, + ENCODINGS_12x22, }; - diff --git a/usr/src/uts/common/io/6x10.c b/usr/src/uts/common/io/6x10.c index eab868f5b8..efafb9c2c2 100644 --- a/usr/src/uts/common/io/6x10.c +++ b/usr/src/uts/common/io/6x10.c @@ -3,8 +3,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/param.h> /* for NULL */ #include <sys/font.h> @@ -19,9 +17,9 @@ /* COPYRIGHT "Public domain terminal emulator font. Share and enjoy." */ -static unsigned char FONTDATA[] = { +static unsigned char FONTDATA_6x10[] = { -/* FONTDATA + 0x0000 */ +/* FONTDATA_6x10 + 0x0000 */ 0x00, /* */ 0x10, /* X */ 0x38, /* XXX */ @@ -33,7 +31,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x000a */ +/* FONTDATA_6x10 + 0x000a */ 0x00, /* */ 0x54, /* X X X */ 0x28, /* X X */ @@ -46,7 +44,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ -/* FONTDATA + 0x0014 */ +/* FONTDATA_6x10 + 0x0014 */ 0x10, /* X */ 0x10, /* X */ 0x10, /* X */ @@ -58,7 +56,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x001e */ +/* FONTDATA_6x10 + 0x001e */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -70,7 +68,7 @@ static unsigned char FONTDATA[] = { 0x10, /* X */ 0x10, /* X */ -/* FONTDATA + 0x0028 */ +/* FONTDATA_6x10 + 0x0028 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -82,7 +80,7 @@ static unsigned char FONTDATA[] = { 0x10, /* X */ 0x10, /* X */ -/* FONTDATA + 0x0032 */ +/* FONTDATA_6x10 + 0x0032 */ 0x10, /* X */ 0x10, /* X */ 0x10, /* X */ @@ -94,7 +92,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x003c */ +/* FONTDATA_6x10 + 0x003c */ 0x10, /* X */ 0x10, /* X */ 0x10, /* X */ @@ -106,7 +104,7 @@ static unsigned char FONTDATA[] = { 0x10, /* X */ 0x10, /* X */ -/* FONTDATA + 0x0046 */ +/* FONTDATA_6x10 + 0x0046 */ 0xfc, /* XXXXXX */ 0x00, /* */ 0x00, /* */ @@ -118,7 +116,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0050 */ +/* FONTDATA_6x10 + 0x0050 */ 0x00, /* */ 0x00, /* */ 0xfc, /* XXXXXX */ @@ -130,7 +128,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x005a */ +/* FONTDATA_6x10 + 0x005a */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -142,7 +140,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0064 */ +/* FONTDATA_6x10 + 0x0064 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -154,7 +152,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x006e */ +/* FONTDATA_6x10 + 0x006e */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -166,7 +164,7 @@ static unsigned char FONTDATA[] = { 0xfc, /* XXXXXX */ 0x00, /* */ -/* FONTDATA + 0x0078 */ +/* FONTDATA_6x10 + 0x0078 */ 0x10, /* X */ 0x10, /* X */ 0x10, /* X */ @@ -178,7 +176,7 @@ static unsigned char FONTDATA[] = { 0x10, /* X */ 0x10, /* X */ -/* FONTDATA + 0x0082 */ +/* FONTDATA_6x10 + 0x0082 */ 0x10, /* X */ 0x10, /* X */ 0x10, /* X */ @@ -190,7 +188,7 @@ static unsigned char FONTDATA[] = { 0x10, /* X */ 0x10, /* X */ -/* FONTDATA + 0x008c */ +/* FONTDATA_6x10 + 0x008c */ 0x10, /* X */ 0x10, /* X */ 0x10, /* X */ @@ -202,7 +200,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0096 */ +/* FONTDATA_6x10 + 0x0096 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -214,7 +212,7 @@ static unsigned char FONTDATA[] = { 0x10, /* X */ 0x10, /* X */ -/* FONTDATA + 0x00a0 */ +/* FONTDATA_6x10 + 0x00a0 */ 0x10, /* X */ 0x10, /* X */ 0x10, /* X */ @@ -226,7 +224,7 @@ static unsigned char FONTDATA[] = { 0x10, /* X */ 0x10, /* X */ -/* FONTDATA + 0x00aa */ +/* FONTDATA_6x10 + 0x00aa */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -238,7 +236,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x00b4 */ +/* FONTDATA_6x10 + 0x00b4 */ 0x00, /* */ 0x10, /* X */ 0x10, /* X */ @@ -250,7 +248,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x00be */ +/* FONTDATA_6x10 + 0x00be */ 0x00, /* */ 0x28, /* X X */ 0x28, /* X X */ @@ -262,7 +260,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x00c8 */ +/* FONTDATA_6x10 + 0x00c8 */ 0x00, /* */ 0x28, /* X X */ 0x28, /* X X */ @@ -274,7 +272,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x00d2 */ +/* FONTDATA_6x10 + 0x00d2 */ 0x00, /* */ 0x10, /* X */ 0x38, /* XXX */ @@ -286,7 +284,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x00dc */ +/* FONTDATA_6x10 + 0x00dc */ 0x00, /* */ 0x24, /* X X */ 0x54, /* X X X */ @@ -298,7 +296,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x00e6 */ +/* FONTDATA_6x10 + 0x00e6 */ 0x00, /* */ 0x20, /* X */ 0x50, /* X X */ @@ -310,7 +308,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x00f0 */ +/* FONTDATA_6x10 + 0x00f0 */ 0x00, /* */ 0x18, /* XX */ 0x10, /* X */ @@ -322,7 +320,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x00fa */ +/* FONTDATA_6x10 + 0x00fa */ 0x00, /* */ 0x08, /* X */ 0x10, /* X */ @@ -334,7 +332,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0104 */ +/* FONTDATA_6x10 + 0x0104 */ 0x00, /* */ 0x20, /* X */ 0x10, /* X */ @@ -346,7 +344,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x010e */ +/* FONTDATA_6x10 + 0x010e */ 0x00, /* */ 0x00, /* */ 0x44, /* X X */ @@ -358,7 +356,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0118 */ +/* FONTDATA_6x10 + 0x0118 */ 0x00, /* */ 0x00, /* */ 0x10, /* X */ @@ -370,7 +368,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0122 */ +/* FONTDATA_6x10 + 0x0122 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -382,7 +380,7 @@ static unsigned char FONTDATA[] = { 0x20, /* X */ 0x00, /* */ -/* FONTDATA + 0x012c */ +/* FONTDATA_6x10 + 0x012c */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -394,7 +392,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0136 */ +/* FONTDATA_6x10 + 0x0136 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -406,7 +404,7 @@ static unsigned char FONTDATA[] = { 0x10, /* X */ 0x00, /* */ -/* FONTDATA + 0x0140 */ +/* FONTDATA_6x10 + 0x0140 */ 0x00, /* */ 0x04, /* X */ 0x04, /* X */ @@ -418,7 +416,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x014a */ +/* FONTDATA_6x10 + 0x014a */ 0x00, /* */ 0x10, /* X */ 0x28, /* X X */ @@ -430,7 +428,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0154 */ +/* FONTDATA_6x10 + 0x0154 */ 0x00, /* */ 0x10, /* X */ 0x30, /* XX */ @@ -442,7 +440,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x015e */ +/* FONTDATA_6x10 + 0x015e */ 0x00, /* */ 0x38, /* XXX */ 0x44, /* X X */ @@ -454,7 +452,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0168 */ +/* FONTDATA_6x10 + 0x0168 */ 0x00, /* */ 0x7c, /* XXXXX */ 0x04, /* X */ @@ -466,7 +464,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0172 */ +/* FONTDATA_6x10 + 0x0172 */ 0x00, /* */ 0x08, /* X */ 0x18, /* XX */ @@ -478,7 +476,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x017c */ +/* FONTDATA_6x10 + 0x017c */ 0x00, /* */ 0x7c, /* XXXXX */ 0x40, /* X */ @@ -490,7 +488,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0186 */ +/* FONTDATA_6x10 + 0x0186 */ 0x00, /* */ 0x18, /* XX */ 0x20, /* X */ @@ -502,7 +500,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0190 */ +/* FONTDATA_6x10 + 0x0190 */ 0x00, /* */ 0x7c, /* XXXXX */ 0x04, /* X */ @@ -514,7 +512,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x019a */ +/* FONTDATA_6x10 + 0x019a */ 0x00, /* */ 0x38, /* XXX */ 0x44, /* X X */ @@ -526,7 +524,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x01a4 */ +/* FONTDATA_6x10 + 0x01a4 */ 0x00, /* */ 0x38, /* XXX */ 0x44, /* X X */ @@ -538,7 +536,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x01ae */ +/* FONTDATA_6x10 + 0x01ae */ 0x00, /* */ 0x00, /* */ 0x10, /* X */ @@ -550,7 +548,7 @@ static unsigned char FONTDATA[] = { 0x10, /* X */ 0x00, /* */ -/* FONTDATA + 0x01b8 */ +/* FONTDATA_6x10 + 0x01b8 */ 0x00, /* */ 0x00, /* */ 0x10, /* X */ @@ -562,7 +560,7 @@ static unsigned char FONTDATA[] = { 0x20, /* X */ 0x00, /* */ -/* FONTDATA + 0x01c2 */ +/* FONTDATA_6x10 + 0x01c2 */ 0x00, /* */ 0x04, /* X */ 0x08, /* X */ @@ -574,7 +572,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x01cc */ +/* FONTDATA_6x10 + 0x01cc */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -586,7 +584,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x01d6 */ +/* FONTDATA_6x10 + 0x01d6 */ 0x00, /* */ 0x40, /* X */ 0x20, /* X */ @@ -598,7 +596,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x01e0 */ +/* FONTDATA_6x10 + 0x01e0 */ 0x00, /* */ 0x38, /* XXX */ 0x44, /* X X */ @@ -610,7 +608,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x01ea */ +/* FONTDATA_6x10 + 0x01ea */ 0x00, /* */ 0x38, /* XXX */ 0x44, /* X X */ @@ -622,7 +620,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x01f4 */ +/* FONTDATA_6x10 + 0x01f4 */ 0x00, /* */ 0x10, /* X */ 0x28, /* X X */ @@ -634,7 +632,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x01fe */ +/* FONTDATA_6x10 + 0x01fe */ 0x00, /* */ 0x78, /* XXXX */ 0x24, /* X X */ @@ -646,7 +644,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0208 */ +/* FONTDATA_6x10 + 0x0208 */ 0x00, /* */ 0x38, /* XXX */ 0x44, /* X X */ @@ -658,7 +656,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0212 */ +/* FONTDATA_6x10 + 0x0212 */ 0x00, /* */ 0x78, /* XXXX */ 0x24, /* X X */ @@ -670,7 +668,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x021c */ +/* FONTDATA_6x10 + 0x021c */ 0x00, /* */ 0x7c, /* XXXXX */ 0x40, /* X */ @@ -682,7 +680,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0226 */ +/* FONTDATA_6x10 + 0x0226 */ 0x00, /* */ 0x7c, /* XXXXX */ 0x40, /* X */ @@ -694,7 +692,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0230 */ +/* FONTDATA_6x10 + 0x0230 */ 0x00, /* */ 0x38, /* XXX */ 0x44, /* X X */ @@ -706,7 +704,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x023a */ +/* FONTDATA_6x10 + 0x023a */ 0x00, /* */ 0x44, /* X X */ 0x44, /* X X */ @@ -718,7 +716,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0244 */ +/* FONTDATA_6x10 + 0x0244 */ 0x00, /* */ 0x38, /* XXX */ 0x10, /* X */ @@ -730,7 +728,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x024e */ +/* FONTDATA_6x10 + 0x024e */ 0x00, /* */ 0x1c, /* XXX */ 0x04, /* X */ @@ -742,7 +740,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0258 */ +/* FONTDATA_6x10 + 0x0258 */ 0x00, /* */ 0x44, /* X X */ 0x48, /* X X */ @@ -754,7 +752,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0262 */ +/* FONTDATA_6x10 + 0x0262 */ 0x00, /* */ 0x40, /* X */ 0x40, /* X */ @@ -766,7 +764,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x026c */ +/* FONTDATA_6x10 + 0x026c */ 0x00, /* */ 0x44, /* X X */ 0x44, /* X X */ @@ -778,7 +776,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0276 */ +/* FONTDATA_6x10 + 0x0276 */ 0x00, /* */ 0x44, /* X X */ 0x44, /* X X */ @@ -790,7 +788,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0280 */ +/* FONTDATA_6x10 + 0x0280 */ 0x00, /* */ 0x38, /* XXX */ 0x44, /* X X */ @@ -802,7 +800,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x028a */ +/* FONTDATA_6x10 + 0x028a */ 0x00, /* */ 0x78, /* XXXX */ 0x44, /* X X */ @@ -814,7 +812,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0294 */ +/* FONTDATA_6x10 + 0x0294 */ 0x00, /* */ 0x38, /* XXX */ 0x44, /* X X */ @@ -826,7 +824,7 @@ static unsigned char FONTDATA[] = { 0x04, /* X */ 0x00, /* */ -/* FONTDATA + 0x029e */ +/* FONTDATA_6x10 + 0x029e */ 0x00, /* */ 0x78, /* XXXX */ 0x44, /* X X */ @@ -838,7 +836,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x02a8 */ +/* FONTDATA_6x10 + 0x02a8 */ 0x00, /* */ 0x38, /* XXX */ 0x44, /* X X */ @@ -850,7 +848,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x02b2 */ +/* FONTDATA_6x10 + 0x02b2 */ 0x00, /* */ 0x7c, /* XXXXX */ 0x10, /* X */ @@ -862,7 +860,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x02bc */ +/* FONTDATA_6x10 + 0x02bc */ 0x00, /* */ 0x44, /* X X */ 0x44, /* X X */ @@ -874,7 +872,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x02c6 */ +/* FONTDATA_6x10 + 0x02c6 */ 0x00, /* */ 0x44, /* X X */ 0x44, /* X X */ @@ -886,7 +884,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x02d0 */ +/* FONTDATA_6x10 + 0x02d0 */ 0x00, /* */ 0x44, /* X X */ 0x44, /* X X */ @@ -898,7 +896,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x02da */ +/* FONTDATA_6x10 + 0x02da */ 0x00, /* */ 0x44, /* X X */ 0x44, /* X X */ @@ -910,7 +908,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x02e4 */ +/* FONTDATA_6x10 + 0x02e4 */ 0x00, /* */ 0x44, /* X X */ 0x44, /* X X */ @@ -922,7 +920,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x02ee */ +/* FONTDATA_6x10 + 0x02ee */ 0x00, /* */ 0x7c, /* XXXXX */ 0x04, /* X */ @@ -934,7 +932,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x02f8 */ +/* FONTDATA_6x10 + 0x02f8 */ 0x00, /* */ 0x38, /* XXX */ 0x20, /* X */ @@ -946,7 +944,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0302 */ +/* FONTDATA_6x10 + 0x0302 */ 0x00, /* */ 0x40, /* X */ 0x40, /* X */ @@ -958,7 +956,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x030c */ +/* FONTDATA_6x10 + 0x030c */ 0x00, /* */ 0x38, /* XXX */ 0x08, /* X */ @@ -970,7 +968,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0316 */ +/* FONTDATA_6x10 + 0x0316 */ 0x00, /* */ 0x10, /* X */ 0x28, /* X X */ @@ -982,7 +980,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0320 */ +/* FONTDATA_6x10 + 0x0320 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -994,7 +992,7 @@ static unsigned char FONTDATA[] = { 0x7c, /* XXXXX */ 0x00, /* */ -/* FONTDATA + 0x032a */ +/* FONTDATA_6x10 + 0x032a */ 0x00, /* */ 0x30, /* XX */ 0x10, /* X */ @@ -1006,7 +1004,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0334 */ +/* FONTDATA_6x10 + 0x0334 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1018,7 +1016,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x033e */ +/* FONTDATA_6x10 + 0x033e */ 0x00, /* */ 0x40, /* X */ 0x40, /* X */ @@ -1030,7 +1028,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0348 */ +/* FONTDATA_6x10 + 0x0348 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1042,7 +1040,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0352 */ +/* FONTDATA_6x10 + 0x0352 */ 0x00, /* */ 0x04, /* X */ 0x04, /* X */ @@ -1054,7 +1052,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x035c */ +/* FONTDATA_6x10 + 0x035c */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1066,7 +1064,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0366 */ +/* FONTDATA_6x10 + 0x0366 */ 0x00, /* */ 0x18, /* XX */ 0x24, /* X X */ @@ -1078,7 +1076,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0370 */ +/* FONTDATA_6x10 + 0x0370 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1090,7 +1088,7 @@ static unsigned char FONTDATA[] = { 0x44, /* X X */ 0x38, /* XXX */ -/* FONTDATA + 0x037a */ +/* FONTDATA_6x10 + 0x037a */ 0x00, /* */ 0x40, /* X */ 0x40, /* X */ @@ -1102,7 +1100,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0384 */ +/* FONTDATA_6x10 + 0x0384 */ 0x00, /* */ 0x10, /* X */ 0x00, /* */ @@ -1114,7 +1112,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x038e */ +/* FONTDATA_6x10 + 0x038e */ 0x00, /* */ 0x08, /* X */ 0x00, /* */ @@ -1126,7 +1124,7 @@ static unsigned char FONTDATA[] = { 0x48, /* X X */ 0x30, /* XX */ -/* FONTDATA + 0x0398 */ +/* FONTDATA_6x10 + 0x0398 */ 0x00, /* */ 0x40, /* X */ 0x40, /* X */ @@ -1138,7 +1136,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x03a2 */ +/* FONTDATA_6x10 + 0x03a2 */ 0x00, /* */ 0x30, /* XX */ 0x10, /* X */ @@ -1150,7 +1148,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x03ac */ +/* FONTDATA_6x10 + 0x03ac */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1162,7 +1160,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x03b6 */ +/* FONTDATA_6x10 + 0x03b6 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1174,7 +1172,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x03c0 */ +/* FONTDATA_6x10 + 0x03c0 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1186,7 +1184,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x03ca */ +/* FONTDATA_6x10 + 0x03ca */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1198,7 +1196,7 @@ static unsigned char FONTDATA[] = { 0x40, /* X */ 0x40, /* X */ -/* FONTDATA + 0x03d4 */ +/* FONTDATA_6x10 + 0x03d4 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1210,7 +1208,7 @@ static unsigned char FONTDATA[] = { 0x04, /* X */ 0x04, /* X */ -/* FONTDATA + 0x03de */ +/* FONTDATA_6x10 + 0x03de */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1222,7 +1220,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x03e8 */ +/* FONTDATA_6x10 + 0x03e8 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1234,7 +1232,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x03f2 */ +/* FONTDATA_6x10 + 0x03f2 */ 0x00, /* */ 0x20, /* X */ 0x20, /* X */ @@ -1246,7 +1244,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x03fc */ +/* FONTDATA_6x10 + 0x03fc */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1258,7 +1256,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0406 */ +/* FONTDATA_6x10 + 0x0406 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1270,7 +1268,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0410 */ +/* FONTDATA_6x10 + 0x0410 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1282,7 +1280,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x041a */ +/* FONTDATA_6x10 + 0x041a */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1294,7 +1292,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0424 */ +/* FONTDATA_6x10 + 0x0424 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1306,7 +1304,7 @@ static unsigned char FONTDATA[] = { 0x44, /* X X */ 0x38, /* XXX */ -/* FONTDATA + 0x042e */ +/* FONTDATA_6x10 + 0x042e */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1318,7 +1316,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0438 */ +/* FONTDATA_6x10 + 0x0438 */ 0x00, /* */ 0x0c, /* XX */ 0x10, /* X */ @@ -1330,7 +1328,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0442 */ +/* FONTDATA_6x10 + 0x0442 */ 0x00, /* */ 0x10, /* X */ 0x10, /* X */ @@ -1342,7 +1340,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x044c */ +/* FONTDATA_6x10 + 0x044c */ 0x00, /* */ 0x60, /* XX */ 0x10, /* X */ @@ -1354,7 +1352,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0456 */ +/* FONTDATA_6x10 + 0x0456 */ 0x00, /* */ 0x24, /* X X */ 0x54, /* X X X */ @@ -1366,7 +1364,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0460 */ +/* FONTDATA_6x10 + 0x0460 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1378,7 +1376,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x046a */ +/* FONTDATA_6x10 + 0x046a */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1390,7 +1388,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0474 */ +/* FONTDATA_6x10 + 0x0474 */ 0x00, /* */ 0x10, /* X */ 0x00, /* */ @@ -1402,7 +1400,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x047e */ +/* FONTDATA_6x10 + 0x047e */ 0x00, /* */ 0x00, /* */ 0x10, /* X */ @@ -1414,7 +1412,7 @@ static unsigned char FONTDATA[] = { 0x10, /* X */ 0x00, /* */ -/* FONTDATA + 0x0488 */ +/* FONTDATA_6x10 + 0x0488 */ 0x00, /* */ 0x18, /* XX */ 0x24, /* X X */ @@ -1426,7 +1424,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0492 */ +/* FONTDATA_6x10 + 0x0492 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1438,7 +1436,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x049c */ +/* FONTDATA_6x10 + 0x049c */ 0x00, /* */ 0x44, /* X X */ 0x44, /* X X */ @@ -1450,7 +1448,7 @@ static unsigned char FONTDATA[] = { 0x10, /* X */ 0x00, /* */ -/* FONTDATA + 0x04a6 */ +/* FONTDATA_6x10 + 0x04a6 */ 0x00, /* */ 0x10, /* X */ 0x10, /* X */ @@ -1462,7 +1460,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x04b0 */ +/* FONTDATA_6x10 + 0x04b0 */ 0x00, /* */ 0x38, /* XXX */ 0x40, /* X */ @@ -1474,7 +1472,7 @@ static unsigned char FONTDATA[] = { 0x38, /* XXX */ 0x00, /* */ -/* FONTDATA + 0x04ba */ +/* FONTDATA_6x10 + 0x04ba */ 0x28, /* X X */ 0x00, /* */ 0x00, /* */ @@ -1486,7 +1484,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x04c4 */ +/* FONTDATA_6x10 + 0x04c4 */ 0x00, /* */ 0x38, /* XXX */ 0x44, /* X X */ @@ -1498,7 +1496,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x04ce */ +/* FONTDATA_6x10 + 0x04ce */ 0x00, /* */ 0x38, /* XXX */ 0x48, /* X X */ @@ -1510,7 +1508,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x04d8 */ +/* FONTDATA_6x10 + 0x04d8 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1522,7 +1520,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x04e2 */ +/* FONTDATA_6x10 + 0x04e2 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1534,7 +1532,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x04ec */ +/* FONTDATA_6x10 + 0x04ec */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1546,7 +1544,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x04f6 */ +/* FONTDATA_6x10 + 0x04f6 */ 0x00, /* */ 0x38, /* XXX */ 0x44, /* X X */ @@ -1558,7 +1556,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0500 */ +/* FONTDATA_6x10 + 0x0500 */ 0x7c, /* XXXXX */ 0x00, /* */ 0x00, /* */ @@ -1570,7 +1568,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x050a */ +/* FONTDATA_6x10 + 0x050a */ 0x00, /* */ 0x10, /* X */ 0x28, /* X X */ @@ -1582,7 +1580,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0514 */ +/* FONTDATA_6x10 + 0x0514 */ 0x00, /* */ 0x00, /* */ 0x10, /* X */ @@ -1594,7 +1592,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x051e */ +/* FONTDATA_6x10 + 0x051e */ 0x30, /* XX */ 0x48, /* X X */ 0x10, /* X */ @@ -1606,7 +1604,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0528 */ +/* FONTDATA_6x10 + 0x0528 */ 0x70, /* XXX */ 0x08, /* X */ 0x30, /* XX */ @@ -1618,7 +1616,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0532 */ +/* FONTDATA_6x10 + 0x0532 */ 0x18, /* XX */ 0x30, /* XX */ 0x00, /* */ @@ -1630,7 +1628,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x053c */ +/* FONTDATA_6x10 + 0x053c */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1642,7 +1640,7 @@ static unsigned char FONTDATA[] = { 0x40, /* X */ 0x00, /* */ -/* FONTDATA + 0x0546 */ +/* FONTDATA_6x10 + 0x0546 */ 0x00, /* */ 0x3c, /* XXXX */ 0x74, /* XXX X */ @@ -1654,7 +1652,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0550 */ +/* FONTDATA_6x10 + 0x0550 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1666,7 +1664,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x055a */ +/* FONTDATA_6x10 + 0x055a */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1678,7 +1676,7 @@ static unsigned char FONTDATA[] = { 0x10, /* X */ 0x20, /* X */ -/* FONTDATA + 0x0564 */ +/* FONTDATA_6x10 + 0x0564 */ 0x10, /* X */ 0x30, /* XX */ 0x10, /* X */ @@ -1690,7 +1688,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x056e */ +/* FONTDATA_6x10 + 0x056e */ 0x00, /* */ 0x30, /* XX */ 0x48, /* X X */ @@ -1702,7 +1700,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0578 */ +/* FONTDATA_6x10 + 0x0578 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -1714,7 +1712,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0582 */ +/* FONTDATA_6x10 + 0x0582 */ 0x40, /* X */ 0xc0, /* XX */ 0x40, /* X */ @@ -1726,7 +1724,7 @@ static unsigned char FONTDATA[] = { 0x04, /* X */ 0x00, /* */ -/* FONTDATA + 0x058c */ +/* FONTDATA_6x10 + 0x058c */ 0x40, /* X */ 0xc0, /* XX */ 0x40, /* X */ @@ -1738,7 +1736,7 @@ static unsigned char FONTDATA[] = { 0x1c, /* XXX */ 0x00, /* */ -/* FONTDATA + 0x0596 */ +/* FONTDATA_6x10 + 0x0596 */ 0x60, /* XX */ 0x10, /* X */ 0x20, /* X */ @@ -1750,7 +1748,7 @@ static unsigned char FONTDATA[] = { 0x04, /* X */ 0x00, /* */ -/* FONTDATA + 0x05a0 */ +/* FONTDATA_6x10 + 0x05a0 */ 0x00, /* */ 0x10, /* X */ 0x00, /* */ @@ -1762,7 +1760,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x05aa */ +/* FONTDATA_6x10 + 0x05aa */ 0x20, /* X */ 0x10, /* X */ 0x38, /* XXX */ @@ -1774,7 +1772,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x05b4 */ +/* FONTDATA_6x10 + 0x05b4 */ 0x08, /* X */ 0x10, /* X */ 0x38, /* XXX */ @@ -1786,7 +1784,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x05be */ +/* FONTDATA_6x10 + 0x05be */ 0x10, /* X */ 0x28, /* X X */ 0x38, /* XXX */ @@ -1798,7 +1796,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x05c8 */ +/* FONTDATA_6x10 + 0x05c8 */ 0x24, /* X X */ 0x58, /* X XX */ 0x38, /* XXX */ @@ -1810,7 +1808,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x05d2 */ +/* FONTDATA_6x10 + 0x05d2 */ 0x28, /* X X */ 0x00, /* */ 0x38, /* XXX */ @@ -1822,7 +1820,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x05dc */ +/* FONTDATA_6x10 + 0x05dc */ 0x10, /* X */ 0x28, /* X X */ 0x38, /* XXX */ @@ -1834,7 +1832,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x05e6 */ +/* FONTDATA_6x10 + 0x05e6 */ 0x00, /* */ 0x3c, /* XXXX */ 0x50, /* X X */ @@ -1846,7 +1844,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x05f0 */ +/* FONTDATA_6x10 + 0x05f0 */ 0x00, /* */ 0x38, /* XXX */ 0x44, /* X X */ @@ -1858,7 +1856,7 @@ static unsigned char FONTDATA[] = { 0x10, /* X */ 0x20, /* X */ -/* FONTDATA + 0x05fa */ +/* FONTDATA_6x10 + 0x05fa */ 0x20, /* X */ 0x7c, /* XXXXX */ 0x40, /* X */ @@ -1870,7 +1868,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0604 */ +/* FONTDATA_6x10 + 0x0604 */ 0x08, /* X */ 0x7c, /* XXXXX */ 0x40, /* X */ @@ -1882,7 +1880,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x060e */ +/* FONTDATA_6x10 + 0x060e */ 0x10, /* X */ 0x7c, /* XXXXX */ 0x40, /* X */ @@ -1894,7 +1892,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0618 */ +/* FONTDATA_6x10 + 0x0618 */ 0x28, /* X X */ 0x7c, /* XXXXX */ 0x40, /* X */ @@ -1906,7 +1904,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0622 */ +/* FONTDATA_6x10 + 0x0622 */ 0x20, /* X */ 0x38, /* XXX */ 0x10, /* X */ @@ -1918,7 +1916,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x062c */ +/* FONTDATA_6x10 + 0x062c */ 0x08, /* X */ 0x38, /* XXX */ 0x10, /* X */ @@ -1930,7 +1928,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0636 */ +/* FONTDATA_6x10 + 0x0636 */ 0x10, /* X */ 0x38, /* XXX */ 0x10, /* X */ @@ -1942,7 +1940,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0640 */ +/* FONTDATA_6x10 + 0x0640 */ 0x28, /* X X */ 0x38, /* XXX */ 0x10, /* X */ @@ -1954,7 +1952,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x064a */ +/* FONTDATA_6x10 + 0x064a */ 0x00, /* */ 0x78, /* XXXX */ 0x24, /* X X */ @@ -1966,7 +1964,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0654 */ +/* FONTDATA_6x10 + 0x0654 */ 0x18, /* XX */ 0x44, /* X X */ 0x44, /* X X */ @@ -1978,7 +1976,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x065e */ +/* FONTDATA_6x10 + 0x065e */ 0x20, /* X */ 0x38, /* XXX */ 0x44, /* X X */ @@ -1990,7 +1988,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0668 */ +/* FONTDATA_6x10 + 0x0668 */ 0x08, /* X */ 0x38, /* XXX */ 0x44, /* X X */ @@ -2002,7 +2000,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0672 */ +/* FONTDATA_6x10 + 0x0672 */ 0x10, /* X */ 0x38, /* XXX */ 0x44, /* X X */ @@ -2014,7 +2012,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x067c */ +/* FONTDATA_6x10 + 0x067c */ 0x38, /* XXX */ 0x38, /* XXX */ 0x44, /* X X */ @@ -2026,7 +2024,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0686 */ +/* FONTDATA_6x10 + 0x0686 */ 0x28, /* X X */ 0x38, /* XXX */ 0x44, /* X X */ @@ -2038,7 +2036,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0690 */ +/* FONTDATA_6x10 + 0x0690 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -2050,7 +2048,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x069a */ +/* FONTDATA_6x10 + 0x069a */ 0x00, /* */ 0x38, /* XXX */ 0x4c, /* X XX */ @@ -2062,7 +2060,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x06a4 */ +/* FONTDATA_6x10 + 0x06a4 */ 0x20, /* X */ 0x54, /* X X X */ 0x44, /* X X */ @@ -2074,7 +2072,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x06ae */ +/* FONTDATA_6x10 + 0x06ae */ 0x08, /* X */ 0x54, /* X X X */ 0x44, /* X X */ @@ -2086,7 +2084,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x06b8 */ +/* FONTDATA_6x10 + 0x06b8 */ 0x10, /* X */ 0x6c, /* XX XX */ 0x44, /* X X */ @@ -2098,7 +2096,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x06c2 */ +/* FONTDATA_6x10 + 0x06c2 */ 0x28, /* X X */ 0x44, /* X X */ 0x44, /* X X */ @@ -2110,7 +2108,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x06cc */ +/* FONTDATA_6x10 + 0x06cc */ 0x08, /* X */ 0x54, /* X X X */ 0x44, /* X X */ @@ -2122,7 +2120,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x06d6 */ +/* FONTDATA_6x10 + 0x06d6 */ 0x00, /* */ 0x40, /* X */ 0x78, /* XXXX */ @@ -2134,7 +2132,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x06e0 */ +/* FONTDATA_6x10 + 0x06e0 */ 0x00, /* */ 0x38, /* XXX */ 0x44, /* X X */ @@ -2146,7 +2144,7 @@ static unsigned char FONTDATA[] = { 0x40, /* X */ 0x00, /* */ -/* FONTDATA + 0x06ea */ +/* FONTDATA_6x10 + 0x06ea */ 0x00, /* */ 0x20, /* X */ 0x10, /* X */ @@ -2158,7 +2156,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x06f4 */ +/* FONTDATA_6x10 + 0x06f4 */ 0x00, /* */ 0x08, /* X */ 0x10, /* X */ @@ -2170,7 +2168,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x06fe */ +/* FONTDATA_6x10 + 0x06fe */ 0x00, /* */ 0x10, /* X */ 0x28, /* X X */ @@ -2182,7 +2180,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0708 */ +/* FONTDATA_6x10 + 0x0708 */ 0x00, /* */ 0x14, /* X X */ 0x28, /* X X */ @@ -2194,7 +2192,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0712 */ +/* FONTDATA_6x10 + 0x0712 */ 0x00, /* */ 0x28, /* X X */ 0x00, /* */ @@ -2206,7 +2204,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x071c */ +/* FONTDATA_6x10 + 0x071c */ 0x10, /* X */ 0x28, /* X X */ 0x10, /* X */ @@ -2218,7 +2216,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0726 */ +/* FONTDATA_6x10 + 0x0726 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -2230,7 +2228,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0730 */ +/* FONTDATA_6x10 + 0x0730 */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -2242,7 +2240,7 @@ static unsigned char FONTDATA[] = { 0x10, /* X */ 0x20, /* X */ -/* FONTDATA + 0x073a */ +/* FONTDATA_6x10 + 0x073a */ 0x00, /* */ 0x20, /* X */ 0x10, /* X */ @@ -2254,7 +2252,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0744 */ +/* FONTDATA_6x10 + 0x0744 */ 0x00, /* */ 0x08, /* X */ 0x10, /* X */ @@ -2266,7 +2264,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x074e */ +/* FONTDATA_6x10 + 0x074e */ 0x00, /* */ 0x10, /* X */ 0x28, /* X X */ @@ -2278,7 +2276,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0758 */ +/* FONTDATA_6x10 + 0x0758 */ 0x00, /* */ 0x28, /* X X */ 0x00, /* */ @@ -2290,7 +2288,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0762 */ +/* FONTDATA_6x10 + 0x0762 */ 0x20, /* X */ 0x10, /* X */ 0x00, /* */ @@ -2302,7 +2300,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x076c */ +/* FONTDATA_6x10 + 0x076c */ 0x10, /* X */ 0x20, /* X */ 0x00, /* */ @@ -2314,7 +2312,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0776 */ +/* FONTDATA_6x10 + 0x0776 */ 0x10, /* X */ 0x28, /* X X */ 0x00, /* */ @@ -2326,7 +2324,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0780 */ +/* FONTDATA_6x10 + 0x0780 */ 0x00, /* */ 0x28, /* X X */ 0x00, /* */ @@ -2338,7 +2336,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x078a */ +/* FONTDATA_6x10 + 0x078a */ 0x00, /* */ 0x60, /* XX */ 0x18, /* XX */ @@ -2350,7 +2348,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0794 */ +/* FONTDATA_6x10 + 0x0794 */ 0x00, /* */ 0x14, /* X X */ 0x28, /* X X */ @@ -2362,7 +2360,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x079e */ +/* FONTDATA_6x10 + 0x079e */ 0x00, /* */ 0x20, /* X */ 0x10, /* X */ @@ -2374,7 +2372,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x07a8 */ +/* FONTDATA_6x10 + 0x07a8 */ 0x00, /* */ 0x08, /* X */ 0x10, /* X */ @@ -2386,7 +2384,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x07b2 */ +/* FONTDATA_6x10 + 0x07b2 */ 0x00, /* */ 0x10, /* X */ 0x28, /* X X */ @@ -2398,7 +2396,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x07bc */ +/* FONTDATA_6x10 + 0x07bc */ 0x00, /* */ 0x14, /* X X */ 0x28, /* X X */ @@ -2410,7 +2408,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x07c6 */ +/* FONTDATA_6x10 + 0x07c6 */ 0x00, /* */ 0x28, /* X X */ 0x00, /* */ @@ -2422,7 +2420,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x07d0 */ +/* FONTDATA_6x10 + 0x07d0 */ 0x00, /* */ 0x00, /* */ 0x10, /* X */ @@ -2434,7 +2432,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x07da */ +/* FONTDATA_6x10 + 0x07da */ 0x00, /* */ 0x00, /* */ 0x00, /* */ @@ -2446,7 +2444,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x07e4 */ +/* FONTDATA_6x10 + 0x07e4 */ 0x00, /* */ 0x20, /* X */ 0x10, /* X */ @@ -2458,7 +2456,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x07ee */ +/* FONTDATA_6x10 + 0x07ee */ 0x00, /* */ 0x08, /* X */ 0x10, /* X */ @@ -2470,7 +2468,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x07f8 */ +/* FONTDATA_6x10 + 0x07f8 */ 0x00, /* */ 0x10, /* X */ 0x28, /* X X */ @@ -2482,7 +2480,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x0802 */ +/* FONTDATA_6x10 + 0x0802 */ 0x00, /* */ 0x28, /* X X */ 0x00, /* */ @@ -2494,7 +2492,7 @@ static unsigned char FONTDATA[] = { 0x00, /* */ 0x00, /* */ -/* FONTDATA + 0x080c */ +/* FONTDATA_6x10 + 0x080c */ 0x00, /* */ 0x08, /* X */ 0x10, /* X */ @@ -2506,7 +2504,7 @@ static unsigned char FONTDATA[] = { 0x44, /* X X */ 0x38, /* XXX */ -/* FONTDATA + 0x0816 */ +/* FONTDATA_6x10 + 0x0816 */ 0x00, /* */ 0x00, /* */ 0x40, /* X */ @@ -2518,7 +2516,7 @@ static unsigned char FONTDATA[] = { 0x40, /* X */ 0x40, /* X */ -/* FONTDATA + 0x0820 */ +/* FONTDATA_6x10 + 0x0820 */ 0x00, /* */ 0x28, /* X X */ 0x00, /* */ @@ -2531,269 +2529,269 @@ static unsigned char FONTDATA[] = { 0x38, /* XXX */ }; -static unsigned char *ENCODINGS[256] = { -/* 000 */ FONTDATA + 0x0000, -/* 001 */ FONTDATA + 0x0000, -/* 002 */ FONTDATA + 0x0000, -/* 003 */ FONTDATA + 0x0000, -/* 004 */ FONTDATA + 0x0000, -/* 005 */ FONTDATA + 0x0000, -/* 006 */ FONTDATA + 0x0000, -/* 007 */ FONTDATA + 0x0000, -/* 008 */ FONTDATA + 0x0000, -/* 009 */ FONTDATA + 0x0000, -/* 010 */ FONTDATA + 0x0000, -/* 011 */ FONTDATA + 0x0000, -/* 012 */ FONTDATA + 0x0000, -/* 013 */ FONTDATA + 0x0000, -/* 014 */ FONTDATA + 0x0000, -/* 015 */ FONTDATA + 0x0000, -/* 016 */ FONTDATA + 0x0000, -/* 017 */ FONTDATA + 0x0000, -/* 018 */ FONTDATA + 0x0000, -/* 019 */ FONTDATA + 0x0000, -/* 020 */ FONTDATA + 0x0000, -/* 021 */ FONTDATA + 0x0000, -/* 022 */ FONTDATA + 0x0000, -/* 023 */ FONTDATA + 0x0000, -/* 024 */ FONTDATA + 0x0000, -/* 025 */ FONTDATA + 0x0000, -/* 026 */ FONTDATA + 0x0000, -/* 027 */ FONTDATA + 0x0000, -/* 028 */ FONTDATA + 0x0000, -/* 029 */ FONTDATA + 0x0000, -/* 030 */ FONTDATA + 0x0000, -/* 031 */ FONTDATA + 0x0000, -/* 032 */ FONTDATA + 0x00aa, -/* 033 */ FONTDATA + 0x00b4, -/* 034 */ FONTDATA + 0x00be, -/* 035 */ FONTDATA + 0x00c8, -/* 036 */ FONTDATA + 0x00d2, -/* 037 */ FONTDATA + 0x00dc, -/* 038 */ FONTDATA + 0x00e6, -/* 039 */ FONTDATA + 0x00f0, -/* 040 */ FONTDATA + 0x00fa, -/* 041 */ FONTDATA + 0x0104, -/* 042 */ FONTDATA + 0x010e, -/* 043 */ FONTDATA + 0x0118, -/* 044 */ FONTDATA + 0x0122, -/* 045 */ FONTDATA + 0x012c, -/* 046 */ FONTDATA + 0x0136, -/* 047 */ FONTDATA + 0x0140, -/* 048 */ FONTDATA + 0x014a, -/* 049 */ FONTDATA + 0x0154, -/* 050 */ FONTDATA + 0x015e, -/* 051 */ FONTDATA + 0x0168, -/* 052 */ FONTDATA + 0x0172, -/* 053 */ FONTDATA + 0x017c, -/* 054 */ FONTDATA + 0x0186, -/* 055 */ FONTDATA + 0x0190, -/* 056 */ FONTDATA + 0x019a, -/* 057 */ FONTDATA + 0x01a4, -/* 058 */ FONTDATA + 0x01ae, -/* 059 */ FONTDATA + 0x01b8, -/* 060 */ FONTDATA + 0x01c2, -/* 061 */ FONTDATA + 0x01cc, -/* 062 */ FONTDATA + 0x01d6, -/* 063 */ FONTDATA + 0x01e0, -/* 064 */ FONTDATA + 0x01ea, -/* 065 */ FONTDATA + 0x01f4, -/* 066 */ FONTDATA + 0x01fe, -/* 067 */ FONTDATA + 0x0208, -/* 068 */ FONTDATA + 0x0212, -/* 069 */ FONTDATA + 0x021c, -/* 070 */ FONTDATA + 0x0226, -/* 071 */ FONTDATA + 0x0230, -/* 072 */ FONTDATA + 0x023a, -/* 073 */ FONTDATA + 0x0244, -/* 074 */ FONTDATA + 0x024e, -/* 075 */ FONTDATA + 0x0258, -/* 076 */ FONTDATA + 0x0262, -/* 077 */ FONTDATA + 0x026c, -/* 078 */ FONTDATA + 0x0276, -/* 079 */ FONTDATA + 0x0280, -/* 080 */ FONTDATA + 0x028a, -/* 081 */ FONTDATA + 0x0294, -/* 082 */ FONTDATA + 0x029e, -/* 083 */ FONTDATA + 0x02a8, -/* 084 */ FONTDATA + 0x02b2, -/* 085 */ FONTDATA + 0x02bc, -/* 086 */ FONTDATA + 0x02c6, -/* 087 */ FONTDATA + 0x02d0, -/* 088 */ FONTDATA + 0x02da, -/* 089 */ FONTDATA + 0x02e4, -/* 090 */ FONTDATA + 0x02ee, -/* 091 */ FONTDATA + 0x02f8, -/* 092 */ FONTDATA + 0x0302, -/* 093 */ FONTDATA + 0x030c, -/* 094 */ FONTDATA + 0x0316, -/* 095 */ FONTDATA + 0x0320, -/* 096 */ FONTDATA + 0x032a, -/* 097 */ FONTDATA + 0x0334, -/* 098 */ FONTDATA + 0x033e, -/* 099 */ FONTDATA + 0x0348, -/* 100 */ FONTDATA + 0x0352, -/* 101 */ FONTDATA + 0x035c, -/* 102 */ FONTDATA + 0x0366, -/* 103 */ FONTDATA + 0x0370, -/* 104 */ FONTDATA + 0x037a, -/* 105 */ FONTDATA + 0x0384, -/* 106 */ FONTDATA + 0x038e, -/* 107 */ FONTDATA + 0x0398, -/* 108 */ FONTDATA + 0x03a2, -/* 109 */ FONTDATA + 0x03ac, -/* 110 */ FONTDATA + 0x03b6, -/* 111 */ FONTDATA + 0x03c0, -/* 112 */ FONTDATA + 0x03ca, -/* 113 */ FONTDATA + 0x03d4, -/* 114 */ FONTDATA + 0x03de, -/* 115 */ FONTDATA + 0x03e8, -/* 116 */ FONTDATA + 0x03f2, -/* 117 */ FONTDATA + 0x03fc, -/* 118 */ FONTDATA + 0x0406, -/* 119 */ FONTDATA + 0x0410, -/* 120 */ FONTDATA + 0x041a, -/* 121 */ FONTDATA + 0x0424, -/* 122 */ FONTDATA + 0x042e, -/* 123 */ FONTDATA + 0x0438, -/* 124 */ FONTDATA + 0x0442, -/* 125 */ FONTDATA + 0x044c, -/* 126 */ FONTDATA + 0x0456, -/* 127 */ FONTDATA + 0x0000, -/* 128 */ FONTDATA + 0x0000, -/* 129 */ FONTDATA + 0x0000, -/* 130 */ FONTDATA + 0x0000, -/* 131 */ FONTDATA + 0x0000, -/* 132 */ FONTDATA + 0x0000, -/* 133 */ FONTDATA + 0x0000, -/* 134 */ FONTDATA + 0x0000, -/* 135 */ FONTDATA + 0x0000, -/* 136 */ FONTDATA + 0x0000, -/* 137 */ FONTDATA + 0x0000, -/* 138 */ FONTDATA + 0x0000, -/* 139 */ FONTDATA + 0x0000, -/* 140 */ FONTDATA + 0x0000, -/* 141 */ FONTDATA + 0x0000, -/* 142 */ FONTDATA + 0x0000, -/* 143 */ FONTDATA + 0x0000, -/* 144 */ FONTDATA + 0x0000, -/* 145 */ FONTDATA + 0x0000, -/* 146 */ FONTDATA + 0x0000, -/* 147 */ FONTDATA + 0x0000, -/* 148 */ FONTDATA + 0x0000, -/* 149 */ FONTDATA + 0x0000, -/* 150 */ FONTDATA + 0x0000, -/* 151 */ FONTDATA + 0x0000, -/* 152 */ FONTDATA + 0x0000, -/* 153 */ FONTDATA + 0x0000, -/* 154 */ FONTDATA + 0x0000, -/* 155 */ FONTDATA + 0x0000, -/* 156 */ FONTDATA + 0x0000, -/* 157 */ FONTDATA + 0x0000, -/* 158 */ FONTDATA + 0x0000, -/* 159 */ FONTDATA + 0x0000, -/* 160 */ FONTDATA + 0x0000, -/* 161 */ FONTDATA + 0x0474, -/* 162 */ FONTDATA + 0x047e, -/* 163 */ FONTDATA + 0x0488, -/* 164 */ FONTDATA + 0x0492, -/* 165 */ FONTDATA + 0x049c, -/* 166 */ FONTDATA + 0x04a6, -/* 167 */ FONTDATA + 0x04b0, -/* 168 */ FONTDATA + 0x04ba, -/* 169 */ FONTDATA + 0x04c4, -/* 170 */ FONTDATA + 0x04ce, -/* 171 */ FONTDATA + 0x04d8, -/* 172 */ FONTDATA + 0x04e2, -/* 173 */ FONTDATA + 0x04ec, -/* 174 */ FONTDATA + 0x04f6, -/* 175 */ FONTDATA + 0x0500, -/* 176 */ FONTDATA + 0x050a, -/* 177 */ FONTDATA + 0x0514, -/* 178 */ FONTDATA + 0x051e, -/* 179 */ FONTDATA + 0x0528, -/* 180 */ FONTDATA + 0x0532, -/* 181 */ FONTDATA + 0x053c, -/* 182 */ FONTDATA + 0x0546, -/* 183 */ FONTDATA + 0x0550, -/* 184 */ FONTDATA + 0x055a, -/* 185 */ FONTDATA + 0x0564, -/* 186 */ FONTDATA + 0x056e, -/* 187 */ FONTDATA + 0x0578, -/* 188 */ FONTDATA + 0x0582, -/* 189 */ FONTDATA + 0x058c, -/* 190 */ FONTDATA + 0x0596, -/* 191 */ FONTDATA + 0x05a0, -/* 192 */ FONTDATA + 0x05aa, -/* 193 */ FONTDATA + 0x05b4, -/* 194 */ FONTDATA + 0x05be, -/* 195 */ FONTDATA + 0x05c8, -/* 196 */ FONTDATA + 0x05d2, -/* 197 */ FONTDATA + 0x05dc, -/* 198 */ FONTDATA + 0x05e6, -/* 199 */ FONTDATA + 0x05f0, -/* 200 */ FONTDATA + 0x05fa, -/* 201 */ FONTDATA + 0x0604, -/* 202 */ FONTDATA + 0x060e, -/* 203 */ FONTDATA + 0x0618, -/* 204 */ FONTDATA + 0x0622, -/* 205 */ FONTDATA + 0x062c, -/* 206 */ FONTDATA + 0x0636, -/* 207 */ FONTDATA + 0x0640, -/* 208 */ FONTDATA + 0x064a, -/* 209 */ FONTDATA + 0x0654, -/* 210 */ FONTDATA + 0x065e, -/* 211 */ FONTDATA + 0x0668, -/* 212 */ FONTDATA + 0x0672, -/* 213 */ FONTDATA + 0x067c, -/* 214 */ FONTDATA + 0x0686, -/* 215 */ FONTDATA + 0x0690, -/* 216 */ FONTDATA + 0x069a, -/* 217 */ FONTDATA + 0x06a4, -/* 218 */ FONTDATA + 0x06ae, -/* 219 */ FONTDATA + 0x06b8, -/* 220 */ FONTDATA + 0x06c2, -/* 221 */ FONTDATA + 0x06cc, -/* 222 */ FONTDATA + 0x06d6, -/* 223 */ FONTDATA + 0x06e0, -/* 224 */ FONTDATA + 0x06ea, -/* 225 */ FONTDATA + 0x06f4, -/* 226 */ FONTDATA + 0x06fe, -/* 227 */ FONTDATA + 0x0708, -/* 228 */ FONTDATA + 0x0712, -/* 229 */ FONTDATA + 0x071c, -/* 230 */ FONTDATA + 0x0726, -/* 231 */ FONTDATA + 0x0730, -/* 232 */ FONTDATA + 0x073a, -/* 233 */ FONTDATA + 0x0744, -/* 234 */ FONTDATA + 0x074e, -/* 235 */ FONTDATA + 0x0758, -/* 236 */ FONTDATA + 0x0762, -/* 237 */ FONTDATA + 0x076c, -/* 238 */ FONTDATA + 0x0776, -/* 239 */ FONTDATA + 0x0780, -/* 240 */ FONTDATA + 0x078a, -/* 241 */ FONTDATA + 0x0794, -/* 242 */ FONTDATA + 0x079e, -/* 243 */ FONTDATA + 0x07a8, -/* 244 */ FONTDATA + 0x07b2, -/* 245 */ FONTDATA + 0x07bc, -/* 246 */ FONTDATA + 0x07c6, -/* 247 */ FONTDATA + 0x07d0, -/* 248 */ FONTDATA + 0x07da, -/* 249 */ FONTDATA + 0x07e4, -/* 250 */ FONTDATA + 0x07ee, -/* 251 */ FONTDATA + 0x07f8, -/* 252 */ FONTDATA + 0x0802, -/* 253 */ FONTDATA + 0x080c, -/* 254 */ FONTDATA + 0x0816, -/* 255 */ FONTDATA + 0x0820, +static unsigned char *ENCODINGS_6x10[256] = { +/* 000 */ FONTDATA_6x10 + 0x0000, +/* 001 */ FONTDATA_6x10 + 0x0000, +/* 002 */ FONTDATA_6x10 + 0x0000, +/* 003 */ FONTDATA_6x10 + 0x0000, +/* 004 */ FONTDATA_6x10 + 0x0000, +/* 005 */ FONTDATA_6x10 + 0x0000, +/* 006 */ FONTDATA_6x10 + 0x0000, +/* 007 */ FONTDATA_6x10 + 0x0000, +/* 008 */ FONTDATA_6x10 + 0x0000, +/* 009 */ FONTDATA_6x10 + 0x0000, +/* 010 */ FONTDATA_6x10 + 0x0000, +/* 011 */ FONTDATA_6x10 + 0x0000, +/* 012 */ FONTDATA_6x10 + 0x0000, +/* 013 */ FONTDATA_6x10 + 0x0000, +/* 014 */ FONTDATA_6x10 + 0x0000, +/* 015 */ FONTDATA_6x10 + 0x0000, +/* 016 */ FONTDATA_6x10 + 0x0000, +/* 017 */ FONTDATA_6x10 + 0x0000, +/* 018 */ FONTDATA_6x10 + 0x0000, +/* 019 */ FONTDATA_6x10 + 0x0000, +/* 020 */ FONTDATA_6x10 + 0x0000, +/* 021 */ FONTDATA_6x10 + 0x0000, +/* 022 */ FONTDATA_6x10 + 0x0000, +/* 023 */ FONTDATA_6x10 + 0x0000, +/* 024 */ FONTDATA_6x10 + 0x0000, +/* 025 */ FONTDATA_6x10 + 0x0000, +/* 026 */ FONTDATA_6x10 + 0x0000, +/* 027 */ FONTDATA_6x10 + 0x0000, +/* 028 */ FONTDATA_6x10 + 0x0000, +/* 029 */ FONTDATA_6x10 + 0x0000, +/* 030 */ FONTDATA_6x10 + 0x0000, +/* 031 */ FONTDATA_6x10 + 0x0000, +/* 032 */ FONTDATA_6x10 + 0x00aa, +/* 033 */ FONTDATA_6x10 + 0x00b4, +/* 034 */ FONTDATA_6x10 + 0x00be, +/* 035 */ FONTDATA_6x10 + 0x00c8, +/* 036 */ FONTDATA_6x10 + 0x00d2, +/* 037 */ FONTDATA_6x10 + 0x00dc, +/* 038 */ FONTDATA_6x10 + 0x00e6, +/* 039 */ FONTDATA_6x10 + 0x00f0, +/* 040 */ FONTDATA_6x10 + 0x00fa, +/* 041 */ FONTDATA_6x10 + 0x0104, +/* 042 */ FONTDATA_6x10 + 0x010e, +/* 043 */ FONTDATA_6x10 + 0x0118, +/* 044 */ FONTDATA_6x10 + 0x0122, +/* 045 */ FONTDATA_6x10 + 0x012c, +/* 046 */ FONTDATA_6x10 + 0x0136, +/* 047 */ FONTDATA_6x10 + 0x0140, +/* 048 */ FONTDATA_6x10 + 0x014a, +/* 049 */ FONTDATA_6x10 + 0x0154, +/* 050 */ FONTDATA_6x10 + 0x015e, +/* 051 */ FONTDATA_6x10 + 0x0168, +/* 052 */ FONTDATA_6x10 + 0x0172, +/* 053 */ FONTDATA_6x10 + 0x017c, +/* 054 */ FONTDATA_6x10 + 0x0186, +/* 055 */ FONTDATA_6x10 + 0x0190, +/* 056 */ FONTDATA_6x10 + 0x019a, +/* 057 */ FONTDATA_6x10 + 0x01a4, +/* 058 */ FONTDATA_6x10 + 0x01ae, +/* 059 */ FONTDATA_6x10 + 0x01b8, +/* 060 */ FONTDATA_6x10 + 0x01c2, +/* 061 */ FONTDATA_6x10 + 0x01cc, +/* 062 */ FONTDATA_6x10 + 0x01d6, +/* 063 */ FONTDATA_6x10 + 0x01e0, +/* 064 */ FONTDATA_6x10 + 0x01ea, +/* 065 */ FONTDATA_6x10 + 0x01f4, +/* 066 */ FONTDATA_6x10 + 0x01fe, +/* 067 */ FONTDATA_6x10 + 0x0208, +/* 068 */ FONTDATA_6x10 + 0x0212, +/* 069 */ FONTDATA_6x10 + 0x021c, +/* 070 */ FONTDATA_6x10 + 0x0226, +/* 071 */ FONTDATA_6x10 + 0x0230, +/* 072 */ FONTDATA_6x10 + 0x023a, +/* 073 */ FONTDATA_6x10 + 0x0244, +/* 074 */ FONTDATA_6x10 + 0x024e, +/* 075 */ FONTDATA_6x10 + 0x0258, +/* 076 */ FONTDATA_6x10 + 0x0262, +/* 077 */ FONTDATA_6x10 + 0x026c, +/* 078 */ FONTDATA_6x10 + 0x0276, +/* 079 */ FONTDATA_6x10 + 0x0280, +/* 080 */ FONTDATA_6x10 + 0x028a, +/* 081 */ FONTDATA_6x10 + 0x0294, +/* 082 */ FONTDATA_6x10 + 0x029e, +/* 083 */ FONTDATA_6x10 + 0x02a8, +/* 084 */ FONTDATA_6x10 + 0x02b2, +/* 085 */ FONTDATA_6x10 + 0x02bc, +/* 086 */ FONTDATA_6x10 + 0x02c6, +/* 087 */ FONTDATA_6x10 + 0x02d0, +/* 088 */ FONTDATA_6x10 + 0x02da, +/* 089 */ FONTDATA_6x10 + 0x02e4, +/* 090 */ FONTDATA_6x10 + 0x02ee, +/* 091 */ FONTDATA_6x10 + 0x02f8, +/* 092 */ FONTDATA_6x10 + 0x0302, +/* 093 */ FONTDATA_6x10 + 0x030c, +/* 094 */ FONTDATA_6x10 + 0x0316, +/* 095 */ FONTDATA_6x10 + 0x0320, +/* 096 */ FONTDATA_6x10 + 0x032a, +/* 097 */ FONTDATA_6x10 + 0x0334, +/* 098 */ FONTDATA_6x10 + 0x033e, +/* 099 */ FONTDATA_6x10 + 0x0348, +/* 100 */ FONTDATA_6x10 + 0x0352, +/* 101 */ FONTDATA_6x10 + 0x035c, +/* 102 */ FONTDATA_6x10 + 0x0366, +/* 103 */ FONTDATA_6x10 + 0x0370, +/* 104 */ FONTDATA_6x10 + 0x037a, +/* 105 */ FONTDATA_6x10 + 0x0384, +/* 106 */ FONTDATA_6x10 + 0x038e, +/* 107 */ FONTDATA_6x10 + 0x0398, +/* 108 */ FONTDATA_6x10 + 0x03a2, +/* 109 */ FONTDATA_6x10 + 0x03ac, +/* 110 */ FONTDATA_6x10 + 0x03b6, +/* 111 */ FONTDATA_6x10 + 0x03c0, +/* 112 */ FONTDATA_6x10 + 0x03ca, +/* 113 */ FONTDATA_6x10 + 0x03d4, +/* 114 */ FONTDATA_6x10 + 0x03de, +/* 115 */ FONTDATA_6x10 + 0x03e8, +/* 116 */ FONTDATA_6x10 + 0x03f2, +/* 117 */ FONTDATA_6x10 + 0x03fc, +/* 118 */ FONTDATA_6x10 + 0x0406, +/* 119 */ FONTDATA_6x10 + 0x0410, +/* 120 */ FONTDATA_6x10 + 0x041a, +/* 121 */ FONTDATA_6x10 + 0x0424, +/* 122 */ FONTDATA_6x10 + 0x042e, +/* 123 */ FONTDATA_6x10 + 0x0438, +/* 124 */ FONTDATA_6x10 + 0x0442, +/* 125 */ FONTDATA_6x10 + 0x044c, +/* 126 */ FONTDATA_6x10 + 0x0456, +/* 127 */ FONTDATA_6x10 + 0x0000, +/* 128 */ FONTDATA_6x10 + 0x0000, +/* 129 */ FONTDATA_6x10 + 0x0000, +/* 130 */ FONTDATA_6x10 + 0x0000, +/* 131 */ FONTDATA_6x10 + 0x0000, +/* 132 */ FONTDATA_6x10 + 0x0000, +/* 133 */ FONTDATA_6x10 + 0x0000, +/* 134 */ FONTDATA_6x10 + 0x0000, +/* 135 */ FONTDATA_6x10 + 0x0000, +/* 136 */ FONTDATA_6x10 + 0x0000, +/* 137 */ FONTDATA_6x10 + 0x0000, +/* 138 */ FONTDATA_6x10 + 0x0000, +/* 139 */ FONTDATA_6x10 + 0x0000, +/* 140 */ FONTDATA_6x10 + 0x0000, +/* 141 */ FONTDATA_6x10 + 0x0000, +/* 142 */ FONTDATA_6x10 + 0x0000, +/* 143 */ FONTDATA_6x10 + 0x0000, +/* 144 */ FONTDATA_6x10 + 0x0000, +/* 145 */ FONTDATA_6x10 + 0x0000, +/* 146 */ FONTDATA_6x10 + 0x0000, +/* 147 */ FONTDATA_6x10 + 0x0000, +/* 148 */ FONTDATA_6x10 + 0x0000, +/* 149 */ FONTDATA_6x10 + 0x0000, +/* 150 */ FONTDATA_6x10 + 0x0000, +/* 151 */ FONTDATA_6x10 + 0x0000, +/* 152 */ FONTDATA_6x10 + 0x0000, +/* 153 */ FONTDATA_6x10 + 0x0000, +/* 154 */ FONTDATA_6x10 + 0x0000, +/* 155 */ FONTDATA_6x10 + 0x0000, +/* 156 */ FONTDATA_6x10 + 0x0000, +/* 157 */ FONTDATA_6x10 + 0x0000, +/* 158 */ FONTDATA_6x10 + 0x0000, +/* 159 */ FONTDATA_6x10 + 0x0000, +/* 160 */ FONTDATA_6x10 + 0x0000, +/* 161 */ FONTDATA_6x10 + 0x0474, +/* 162 */ FONTDATA_6x10 + 0x047e, +/* 163 */ FONTDATA_6x10 + 0x0488, +/* 164 */ FONTDATA_6x10 + 0x0492, +/* 165 */ FONTDATA_6x10 + 0x049c, +/* 166 */ FONTDATA_6x10 + 0x04a6, +/* 167 */ FONTDATA_6x10 + 0x04b0, +/* 168 */ FONTDATA_6x10 + 0x04ba, +/* 169 */ FONTDATA_6x10 + 0x04c4, +/* 170 */ FONTDATA_6x10 + 0x04ce, +/* 171 */ FONTDATA_6x10 + 0x04d8, +/* 172 */ FONTDATA_6x10 + 0x04e2, +/* 173 */ FONTDATA_6x10 + 0x04ec, +/* 174 */ FONTDATA_6x10 + 0x04f6, +/* 175 */ FONTDATA_6x10 + 0x0500, +/* 176 */ FONTDATA_6x10 + 0x050a, +/* 177 */ FONTDATA_6x10 + 0x0514, +/* 178 */ FONTDATA_6x10 + 0x051e, +/* 179 */ FONTDATA_6x10 + 0x0528, +/* 180 */ FONTDATA_6x10 + 0x0532, +/* 181 */ FONTDATA_6x10 + 0x053c, +/* 182 */ FONTDATA_6x10 + 0x0546, +/* 183 */ FONTDATA_6x10 + 0x0550, +/* 184 */ FONTDATA_6x10 + 0x055a, +/* 185 */ FONTDATA_6x10 + 0x0564, +/* 186 */ FONTDATA_6x10 + 0x056e, +/* 187 */ FONTDATA_6x10 + 0x0578, +/* 188 */ FONTDATA_6x10 + 0x0582, +/* 189 */ FONTDATA_6x10 + 0x058c, +/* 190 */ FONTDATA_6x10 + 0x0596, +/* 191 */ FONTDATA_6x10 + 0x05a0, +/* 192 */ FONTDATA_6x10 + 0x05aa, +/* 193 */ FONTDATA_6x10 + 0x05b4, +/* 194 */ FONTDATA_6x10 + 0x05be, +/* 195 */ FONTDATA_6x10 + 0x05c8, +/* 196 */ FONTDATA_6x10 + 0x05d2, +/* 197 */ FONTDATA_6x10 + 0x05dc, +/* 198 */ FONTDATA_6x10 + 0x05e6, +/* 199 */ FONTDATA_6x10 + 0x05f0, +/* 200 */ FONTDATA_6x10 + 0x05fa, +/* 201 */ FONTDATA_6x10 + 0x0604, +/* 202 */ FONTDATA_6x10 + 0x060e, +/* 203 */ FONTDATA_6x10 + 0x0618, +/* 204 */ FONTDATA_6x10 + 0x0622, +/* 205 */ FONTDATA_6x10 + 0x062c, +/* 206 */ FONTDATA_6x10 + 0x0636, +/* 207 */ FONTDATA_6x10 + 0x0640, +/* 208 */ FONTDATA_6x10 + 0x064a, +/* 209 */ FONTDATA_6x10 + 0x0654, +/* 210 */ FONTDATA_6x10 + 0x065e, +/* 211 */ FONTDATA_6x10 + 0x0668, +/* 212 */ FONTDATA_6x10 + 0x0672, +/* 213 */ FONTDATA_6x10 + 0x067c, +/* 214 */ FONTDATA_6x10 + 0x0686, +/* 215 */ FONTDATA_6x10 + 0x0690, +/* 216 */ FONTDATA_6x10 + 0x069a, +/* 217 */ FONTDATA_6x10 + 0x06a4, +/* 218 */ FONTDATA_6x10 + 0x06ae, +/* 219 */ FONTDATA_6x10 + 0x06b8, +/* 220 */ FONTDATA_6x10 + 0x06c2, +/* 221 */ FONTDATA_6x10 + 0x06cc, +/* 222 */ FONTDATA_6x10 + 0x06d6, +/* 223 */ FONTDATA_6x10 + 0x06e0, +/* 224 */ FONTDATA_6x10 + 0x06ea, +/* 225 */ FONTDATA_6x10 + 0x06f4, +/* 226 */ FONTDATA_6x10 + 0x06fe, +/* 227 */ FONTDATA_6x10 + 0x0708, +/* 228 */ FONTDATA_6x10 + 0x0712, +/* 229 */ FONTDATA_6x10 + 0x071c, +/* 230 */ FONTDATA_6x10 + 0x0726, +/* 231 */ FONTDATA_6x10 + 0x0730, +/* 232 */ FONTDATA_6x10 + 0x073a, +/* 233 */ FONTDATA_6x10 + 0x0744, +/* 234 */ FONTDATA_6x10 + 0x074e, +/* 235 */ FONTDATA_6x10 + 0x0758, +/* 236 */ FONTDATA_6x10 + 0x0762, +/* 237 */ FONTDATA_6x10 + 0x076c, +/* 238 */ FONTDATA_6x10 + 0x0776, +/* 239 */ FONTDATA_6x10 + 0x0780, +/* 240 */ FONTDATA_6x10 + 0x078a, +/* 241 */ FONTDATA_6x10 + 0x0794, +/* 242 */ FONTDATA_6x10 + 0x079e, +/* 243 */ FONTDATA_6x10 + 0x07a8, +/* 244 */ FONTDATA_6x10 + 0x07b2, +/* 245 */ FONTDATA_6x10 + 0x07bc, +/* 246 */ FONTDATA_6x10 + 0x07c6, +/* 247 */ FONTDATA_6x10 + 0x07d0, +/* 248 */ FONTDATA_6x10 + 0x07da, +/* 249 */ FONTDATA_6x10 + 0x07e4, +/* 250 */ FONTDATA_6x10 + 0x07ee, +/* 251 */ FONTDATA_6x10 + 0x07f8, +/* 252 */ FONTDATA_6x10 + 0x0802, +/* 253 */ FONTDATA_6x10 + 0x080c, +/* 254 */ FONTDATA_6x10 + 0x0816, +/* 255 */ FONTDATA_6x10 + 0x0820, }; bitmap_data_t font_data_6x10 = { 6, 10, /* width, height */ - FONTDATA, /* image */ - ENCODINGS /* encoding */ + FONTDATA_6x10, /* image */ + ENCODINGS_6x10 /* encoding */ }; diff --git a/usr/src/uts/common/io/7x14.c b/usr/src/uts/common/io/7x14.c index 40a45d4773..afc7b6f237 100644 --- a/usr/src/uts/common/io/7x14.c +++ b/usr/src/uts/common/io/7x14.c @@ -3,8 +3,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/param.h> /* for NULL */ #include <sys/font.h> @@ -20,7 +18,7 @@ /* Copyright notice from .bdf file: */ /* COPYRIGHT "Public domain font. Share and enjoy." */ -static unsigned char FONTDATA[] = { +static unsigned char FONTDATA_7x14[] = { /* 0x01 */ 0x00, /* */ @@ -3367,268 +3365,268 @@ static unsigned char FONTDATA[] = { 0x30, /* XX */ }; -static unsigned char *ENCODINGS[256] = { - FONTDATA+238, - FONTDATA+0, - FONTDATA+14, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+28, - FONTDATA+42, - FONTDATA+56, - FONTDATA+70, - FONTDATA+84, - FONTDATA+98, - FONTDATA+112, - FONTDATA+126, - FONTDATA+140, - FONTDATA+154, - FONTDATA+168, - FONTDATA+182, - FONTDATA+196, - FONTDATA+210, - FONTDATA+224, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+252, - FONTDATA+266, - FONTDATA+280, - FONTDATA+294, - FONTDATA+308, - FONTDATA+322, - FONTDATA+336, - FONTDATA+350, - FONTDATA+364, - FONTDATA+378, - FONTDATA+392, - FONTDATA+406, - FONTDATA+420, - FONTDATA+434, - FONTDATA+448, - FONTDATA+462, - FONTDATA+476, - FONTDATA+490, - FONTDATA+504, - FONTDATA+518, - FONTDATA+532, - FONTDATA+546, - FONTDATA+560, - FONTDATA+574, - FONTDATA+588, - FONTDATA+602, - FONTDATA+616, - FONTDATA+630, - FONTDATA+644, - FONTDATA+658, - FONTDATA+672, - FONTDATA+686, - FONTDATA+700, - FONTDATA+714, - FONTDATA+728, - FONTDATA+742, - FONTDATA+756, - FONTDATA+770, - FONTDATA+784, - FONTDATA+798, - FONTDATA+812, - FONTDATA+826, - FONTDATA+840, - FONTDATA+854, - FONTDATA+868, - FONTDATA+882, - FONTDATA+896, - FONTDATA+910, - FONTDATA+924, - FONTDATA+938, - FONTDATA+952, - FONTDATA+966, - FONTDATA+980, - FONTDATA+994, - FONTDATA+1008, - FONTDATA+1022, - FONTDATA+1036, - FONTDATA+1050, - FONTDATA+1064, - FONTDATA+1078, - FONTDATA+1092, - FONTDATA+1106, - FONTDATA+1120, - FONTDATA+1134, - FONTDATA+1148, - FONTDATA+1162, - FONTDATA+1176, - FONTDATA+1190, - FONTDATA+1204, - FONTDATA+1218, - FONTDATA+1232, - FONTDATA+1246, - FONTDATA+1260, - FONTDATA+1274, - FONTDATA+1288, - FONTDATA+1302, - FONTDATA+1316, - FONTDATA+1330, - FONTDATA+1344, - FONTDATA+1358, - FONTDATA+1372, - FONTDATA+1386, - FONTDATA+1400, - FONTDATA+1414, - FONTDATA+1428, - FONTDATA+1442, - FONTDATA+1456, - FONTDATA+1470, - FONTDATA+1484, - FONTDATA+1498, - FONTDATA+1512, - FONTDATA+1526, - FONTDATA+1540, - FONTDATA+1554, - FONTDATA+1568, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+238, - FONTDATA+1582, - FONTDATA+1596, - FONTDATA+1610, - FONTDATA+1624, - FONTDATA+1638, - FONTDATA+1652, - FONTDATA+1666, - FONTDATA+1680, - FONTDATA+1694, - FONTDATA+1708, - FONTDATA+1722, - FONTDATA+1736, - FONTDATA+1750, - FONTDATA+1764, - FONTDATA+1778, - FONTDATA+1792, - FONTDATA+1806, - FONTDATA+1820, - FONTDATA+1834, - FONTDATA+1848, - FONTDATA+1862, - FONTDATA+1876, - FONTDATA+1890, - FONTDATA+1904, - FONTDATA+1918, - FONTDATA+1932, - FONTDATA+1946, - FONTDATA+1960, - FONTDATA+1974, - FONTDATA+1988, - FONTDATA+2002, - FONTDATA+2016, - FONTDATA+2030, - FONTDATA+2044, - FONTDATA+2058, - FONTDATA+2072, - FONTDATA+2086, - FONTDATA+2100, - FONTDATA+2114, - FONTDATA+2128, - FONTDATA+2142, - FONTDATA+2156, - FONTDATA+2170, - FONTDATA+2184, - FONTDATA+2198, - FONTDATA+2212, - FONTDATA+2226, - FONTDATA+2240, - FONTDATA+2254, - FONTDATA+2268, - FONTDATA+2282, - FONTDATA+2296, - FONTDATA+2310, - FONTDATA+2324, - FONTDATA+2338, - FONTDATA+2352, - FONTDATA+2366, - FONTDATA+2380, - FONTDATA+2394, - FONTDATA+2408, - FONTDATA+2422, - FONTDATA+2436, - FONTDATA+2450, - FONTDATA+2464, - FONTDATA+2478, - FONTDATA+2492, - FONTDATA+2506, - FONTDATA+2520, - FONTDATA+2534, - FONTDATA+2548, - FONTDATA+2562, - FONTDATA+2576, - FONTDATA+2590, - FONTDATA+2604, - FONTDATA+2618, - FONTDATA+2632, - FONTDATA+2646, - FONTDATA+2660, - FONTDATA+2674, - FONTDATA+2688, - FONTDATA+2702, - FONTDATA+2716, - FONTDATA+2730, - FONTDATA+2744, - FONTDATA+2758, - FONTDATA+2772, - FONTDATA+2786, - FONTDATA+2800, - FONTDATA+2814, - FONTDATA+2828, - FONTDATA+2842, - FONTDATA+2856, - FONTDATA+2870, - FONTDATA+2884, - FONTDATA+2898, - FONTDATA+2912, +static unsigned char *ENCODINGS_7x14[256] = { + FONTDATA_7x14+238, + FONTDATA_7x14+0, + FONTDATA_7x14+14, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+28, + FONTDATA_7x14+42, + FONTDATA_7x14+56, + FONTDATA_7x14+70, + FONTDATA_7x14+84, + FONTDATA_7x14+98, + FONTDATA_7x14+112, + FONTDATA_7x14+126, + FONTDATA_7x14+140, + FONTDATA_7x14+154, + FONTDATA_7x14+168, + FONTDATA_7x14+182, + FONTDATA_7x14+196, + FONTDATA_7x14+210, + FONTDATA_7x14+224, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+252, + FONTDATA_7x14+266, + FONTDATA_7x14+280, + FONTDATA_7x14+294, + FONTDATA_7x14+308, + FONTDATA_7x14+322, + FONTDATA_7x14+336, + FONTDATA_7x14+350, + FONTDATA_7x14+364, + FONTDATA_7x14+378, + FONTDATA_7x14+392, + FONTDATA_7x14+406, + FONTDATA_7x14+420, + FONTDATA_7x14+434, + FONTDATA_7x14+448, + FONTDATA_7x14+462, + FONTDATA_7x14+476, + FONTDATA_7x14+490, + FONTDATA_7x14+504, + FONTDATA_7x14+518, + FONTDATA_7x14+532, + FONTDATA_7x14+546, + FONTDATA_7x14+560, + FONTDATA_7x14+574, + FONTDATA_7x14+588, + FONTDATA_7x14+602, + FONTDATA_7x14+616, + FONTDATA_7x14+630, + FONTDATA_7x14+644, + FONTDATA_7x14+658, + FONTDATA_7x14+672, + FONTDATA_7x14+686, + FONTDATA_7x14+700, + FONTDATA_7x14+714, + FONTDATA_7x14+728, + FONTDATA_7x14+742, + FONTDATA_7x14+756, + FONTDATA_7x14+770, + FONTDATA_7x14+784, + FONTDATA_7x14+798, + FONTDATA_7x14+812, + FONTDATA_7x14+826, + FONTDATA_7x14+840, + FONTDATA_7x14+854, + FONTDATA_7x14+868, + FONTDATA_7x14+882, + FONTDATA_7x14+896, + FONTDATA_7x14+910, + FONTDATA_7x14+924, + FONTDATA_7x14+938, + FONTDATA_7x14+952, + FONTDATA_7x14+966, + FONTDATA_7x14+980, + FONTDATA_7x14+994, + FONTDATA_7x14+1008, + FONTDATA_7x14+1022, + FONTDATA_7x14+1036, + FONTDATA_7x14+1050, + FONTDATA_7x14+1064, + FONTDATA_7x14+1078, + FONTDATA_7x14+1092, + FONTDATA_7x14+1106, + FONTDATA_7x14+1120, + FONTDATA_7x14+1134, + FONTDATA_7x14+1148, + FONTDATA_7x14+1162, + FONTDATA_7x14+1176, + FONTDATA_7x14+1190, + FONTDATA_7x14+1204, + FONTDATA_7x14+1218, + FONTDATA_7x14+1232, + FONTDATA_7x14+1246, + FONTDATA_7x14+1260, + FONTDATA_7x14+1274, + FONTDATA_7x14+1288, + FONTDATA_7x14+1302, + FONTDATA_7x14+1316, + FONTDATA_7x14+1330, + FONTDATA_7x14+1344, + FONTDATA_7x14+1358, + FONTDATA_7x14+1372, + FONTDATA_7x14+1386, + FONTDATA_7x14+1400, + FONTDATA_7x14+1414, + FONTDATA_7x14+1428, + FONTDATA_7x14+1442, + FONTDATA_7x14+1456, + FONTDATA_7x14+1470, + FONTDATA_7x14+1484, + FONTDATA_7x14+1498, + FONTDATA_7x14+1512, + FONTDATA_7x14+1526, + FONTDATA_7x14+1540, + FONTDATA_7x14+1554, + FONTDATA_7x14+1568, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+238, + FONTDATA_7x14+1582, + FONTDATA_7x14+1596, + FONTDATA_7x14+1610, + FONTDATA_7x14+1624, + FONTDATA_7x14+1638, + FONTDATA_7x14+1652, + FONTDATA_7x14+1666, + FONTDATA_7x14+1680, + FONTDATA_7x14+1694, + FONTDATA_7x14+1708, + FONTDATA_7x14+1722, + FONTDATA_7x14+1736, + FONTDATA_7x14+1750, + FONTDATA_7x14+1764, + FONTDATA_7x14+1778, + FONTDATA_7x14+1792, + FONTDATA_7x14+1806, + FONTDATA_7x14+1820, + FONTDATA_7x14+1834, + FONTDATA_7x14+1848, + FONTDATA_7x14+1862, + FONTDATA_7x14+1876, + FONTDATA_7x14+1890, + FONTDATA_7x14+1904, + FONTDATA_7x14+1918, + FONTDATA_7x14+1932, + FONTDATA_7x14+1946, + FONTDATA_7x14+1960, + FONTDATA_7x14+1974, + FONTDATA_7x14+1988, + FONTDATA_7x14+2002, + FONTDATA_7x14+2016, + FONTDATA_7x14+2030, + FONTDATA_7x14+2044, + FONTDATA_7x14+2058, + FONTDATA_7x14+2072, + FONTDATA_7x14+2086, + FONTDATA_7x14+2100, + FONTDATA_7x14+2114, + FONTDATA_7x14+2128, + FONTDATA_7x14+2142, + FONTDATA_7x14+2156, + FONTDATA_7x14+2170, + FONTDATA_7x14+2184, + FONTDATA_7x14+2198, + FONTDATA_7x14+2212, + FONTDATA_7x14+2226, + FONTDATA_7x14+2240, + FONTDATA_7x14+2254, + FONTDATA_7x14+2268, + FONTDATA_7x14+2282, + FONTDATA_7x14+2296, + FONTDATA_7x14+2310, + FONTDATA_7x14+2324, + FONTDATA_7x14+2338, + FONTDATA_7x14+2352, + FONTDATA_7x14+2366, + FONTDATA_7x14+2380, + FONTDATA_7x14+2394, + FONTDATA_7x14+2408, + FONTDATA_7x14+2422, + FONTDATA_7x14+2436, + FONTDATA_7x14+2450, + FONTDATA_7x14+2464, + FONTDATA_7x14+2478, + FONTDATA_7x14+2492, + FONTDATA_7x14+2506, + FONTDATA_7x14+2520, + FONTDATA_7x14+2534, + FONTDATA_7x14+2548, + FONTDATA_7x14+2562, + FONTDATA_7x14+2576, + FONTDATA_7x14+2590, + FONTDATA_7x14+2604, + FONTDATA_7x14+2618, + FONTDATA_7x14+2632, + FONTDATA_7x14+2646, + FONTDATA_7x14+2660, + FONTDATA_7x14+2674, + FONTDATA_7x14+2688, + FONTDATA_7x14+2702, + FONTDATA_7x14+2716, + FONTDATA_7x14+2730, + FONTDATA_7x14+2744, + FONTDATA_7x14+2758, + FONTDATA_7x14+2772, + FONTDATA_7x14+2786, + FONTDATA_7x14+2800, + FONTDATA_7x14+2814, + FONTDATA_7x14+2828, + FONTDATA_7x14+2842, + FONTDATA_7x14+2856, + FONTDATA_7x14+2870, + FONTDATA_7x14+2884, + FONTDATA_7x14+2898, + FONTDATA_7x14+2912, }; bitmap_data_t font_data_7x14 = { 7, 14, /* width, height */ - FONTDATA, /* image */ - ENCODINGS, /* encoding */ + FONTDATA_7x14, /* image */ + ENCODINGS_7x14, /* encoding */ }; /* END CSTYLED */ diff --git a/usr/src/uts/i86pc/io/gfx_private/gfxp_vgatext.c b/usr/src/uts/i86pc/io/gfx_private/gfxp_vgatext.c index 174798e2f7..c1aeda647a 100644 --- a/usr/src/uts/i86pc/io/gfx_private/gfxp_vgatext.c +++ b/usr/src/uts/i86pc/io/gfx_private/gfxp_vgatext.c @@ -243,7 +243,7 @@ is_pci_bridge(dev_info_t *dip) static void gfxp_check_for_console(dev_info_t *devi, struct vgatext_softc *softc, - int pci_pcie_bus) + int pci_pcie_bus) { ddi_acc_handle_t pci_conf; dev_info_t *pdevi; @@ -321,7 +321,7 @@ gfxp_check_for_console(dev_info_t *devi, struct vgatext_softc *softc, int gfxp_vgatext_attach(dev_info_t *devi, ddi_attach_cmd_t cmd, - gfxp_vgatext_softc_ptr_t ptr) + gfxp_vgatext_softc_ptr_t ptr) { struct vgatext_softc *softc = (struct vgatext_softc *)ptr; int unit = ddi_get_instance(devi); @@ -487,7 +487,7 @@ fail: /*ARGSUSED*/ int gfxp_vgatext_detach(dev_info_t *devi, ddi_detach_cmd_t cmd, - gfxp_vgatext_softc_ptr_t ptr) + gfxp_vgatext_softc_ptr_t ptr) { struct vgatext_softc *softc = (struct vgatext_softc *)ptr; @@ -516,7 +516,7 @@ gfxp_vgatext_detach(dev_info_t *devi, ddi_detach_cmd_t cmd, /*ARGSUSED*/ int gfxp_vgatext_open(dev_t *devp, int flag, int otyp, cred_t *cred, - gfxp_vgatext_softc_ptr_t ptr) + gfxp_vgatext_softc_ptr_t ptr) { struct vgatext_softc *softc = (struct vgatext_softc *)ptr; @@ -529,7 +529,7 @@ gfxp_vgatext_open(dev_t *devp, int flag, int otyp, cred_t *cred, /*ARGSUSED*/ int gfxp_vgatext_close(dev_t devp, int flag, int otyp, cred_t *cred, - gfxp_vgatext_softc_ptr_t ptr) + gfxp_vgatext_softc_ptr_t ptr) { return (0); } @@ -822,7 +822,7 @@ vgatext_kdsetmode(struct vgatext_softc *softc, int mode) /*ARGSUSED*/ int gfxp_vgatext_devmap(dev_t dev, devmap_cookie_t dhp, offset_t off, size_t len, - size_t *maplen, uint_t model, void *ptr) + size_t *maplen, uint_t model, void *ptr) { struct vgatext_softc *softc = (struct vgatext_softc *)ptr; int err; @@ -1183,7 +1183,7 @@ vgatext_init_graphics(struct vgatext_softc *softc) static void vgatext_setfont(struct vgatext_softc *softc) { - extern unsigned char *ENCODINGS[]; + extern bitmap_data_t font_data_8x16; unsigned char *from; unsigned char *to; int i; @@ -1213,7 +1213,7 @@ vgatext_setfont(struct vgatext_softc *softc) */ bpc = 16; for (i = 0; i < 256; i++) { - from = ENCODINGS[i]; + from = font_data_8x16.encoding[i]; to = (unsigned char *)softc->fb.addr + i * 0x20; for (j = 0; j < bpc; j++) *to++ = *from++; @@ -1376,9 +1376,8 @@ vgatext_get_isa_reg_index( */ void -vgatext_return_pointers(struct vgatext_softc *softc, - struct vgaregmap *fbs, - struct vgaregmap *regss) +vgatext_return_pointers(struct vgatext_softc *softc, struct vgaregmap *fbs, + struct vgaregmap *regss) { fbs->addr = softc->fb.addr; diff --git a/usr/src/uts/intel/io/vgatext/bdf_to_c.awk b/usr/src/uts/intel/io/vgatext/bdf_to_c.awk index dc2287c22e..5365d41bce 100644 --- a/usr/src/uts/intel/io/vgatext/bdf_to_c.awk +++ b/usr/src/uts/intel/io/vgatext/bdf_to_c.awk @@ -24,8 +24,6 @@ # Copyright (c) 1998-1999 by Sun Microsystems, Inc. # All rights reserved. # -#pragma ident "%Z%%M% %I% %E% SMI" -# BEGIN { pats["0"]=" "; @@ -94,6 +92,9 @@ $1=="COMMENT" { } $1=="FONT" { + font = $2; + printf "#include <sys/types.h>\n" + printf "#include <sys/font.h>\n\n" printf "/* %s */\n", $0; next; } @@ -207,7 +208,7 @@ $1=="CHARS" { $1=="STARTCHAR" { if (first) { - printf "unsigned char FONTDATA[] = {\n"; + printf "static unsigned char FONTDATA_%s[] = {\n", font; first = 0; } ignoring = 1; @@ -245,12 +246,17 @@ $1=="BITMAP" { $1=="ENDFONT" { printf "};\n"; printf "\n"; - printf "unsigned char *ENCODINGS[256] = {\n"; + printf "static unsigned char *ENCODINGS_%s[256] = {\n", font; for (i = 0; i < 256; i++) { if (encoding[i] == -1) encoding[i] = encoding[default_char]; - printf "\tFONTDATA+%d,\n", encoding[i]; + printf "\tFONTDATA_%s+%d,\n", font, encoding[i]; } + printf "};\n\n"; + printf "bitmap_data_t font_data_%s = {\n", font; + printf "\t%s, %s,\n", bitswide, rows; + printf "\tFONTDATA_%s,\n", font; + printf "\tENCODINGS_%s\n", font; printf "};\n"; next; } diff --git a/usr/src/uts/intel/io/vgatext/vgatext.c b/usr/src/uts/intel/io/vgatext/vgatext.c index 9ce0e449db..8d1a90ffd0 100644 --- a/usr/src/uts/intel/io/vgatext/vgatext.c +++ b/usr/src/uts/intel/io/vgatext/vgatext.c @@ -354,7 +354,7 @@ is_pci_bridge(dev_info_t *dip) static void vgatext_check_for_console(dev_info_t *devi, struct vgatext_softc *softc, - int pci_pcie_bus) + int pci_pcie_bus) { ddi_acc_handle_t pci_conf; dev_info_t *pdevi; @@ -947,7 +947,7 @@ vgatext_kdsetmode(struct vgatext_softc *softc, int mode) /*ARGSUSED*/ static int vgatext_devmap(dev_t dev, devmap_cookie_t dhp, offset_t off, size_t len, - size_t *maplen, uint_t model) + size_t *maplen, uint_t model) { struct vgatext_softc *softc; int err; @@ -1313,7 +1313,7 @@ vgatext_setfont(struct vgatext_softc *softc) { static uchar_t fsreg[8] = {0x0, 0x30, 0x5, 0x35, 0xa, 0x3a, 0xf, 0x3f}; - extern unsigned char *ENCODINGS[]; + extern bitmap_data_t font_data_8x16; uchar_t *from; uchar_t volatile *to; int i, j, s; @@ -1357,7 +1357,7 @@ vgatext_setfont(struct vgatext_softc *softc) s = vga_fontslot; f_offset = s * 8 * 1024; for (i = 0; i < 256; i++) { - from = ENCODINGS[i]; + from = font_data_8x16.encoding[i]; to = (unsigned char *)softc->fb.addr + f_offset + i * 0x20; for (j = 0; j < bpc; j++) *to++ = *from++; |