Index: asp3_tinet_ecnl_arm/trunk/ntshell/lcd/misaki_font.c
===================================================================
--- asp3_tinet_ecnl_arm/trunk/ntshell/lcd/misaki_font.c	(revision 352)
+++ asp3_tinet_ecnl_arm/trunk/ntshell/lcd/misaki_font.c	(revision 364)
@@ -46,137 +46,137 @@
 
 // 1バイトコード
-unsigned char UTF8_1B_CODE_BITMAP[UTF8_1B_CODE_BITMAP_NUM][8] = {
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x40, 0x40, 0x40, 0x40, 0x00, 0x40, 0x00, 0x00},
-	{0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0xA0, 0xE0, 0xA0, 0xA0, 0xE0, 0xA0, 0x00, 0x00},
-	{0x40, 0xE0, 0xC0, 0x60, 0xE0, 0x40, 0x00, 0x00},
-	{0x00, 0x80, 0x20, 0x40, 0x80, 0x20, 0x00, 0x00},
-	{0x40, 0xA0, 0x40, 0x60, 0xC0, 0xE0, 0x00, 0x00},
-	{0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x20, 0x40, 0x40, 0x40, 0x40, 0x40, 0x20, 0x00},
-	{0x80, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00},
-	{0x40, 0xE0, 0x40, 0xA0, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x40, 0x40, 0xE0, 0x40, 0x40, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00},
-	{0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00},
-	{0x00, 0x00, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00},
-	{0x00, 0x40, 0xA0, 0xE0, 0xA0, 0x40, 0x00, 0x00},
-	{0x00, 0x40, 0xC0, 0x40, 0x40, 0xE0, 0x00, 0x00},
-	{0x00, 0xC0, 0x20, 0x40, 0x80, 0xE0, 0x00, 0x00},
-	{0x00, 0xC0, 0x20, 0x40, 0x20, 0xC0, 0x00, 0x00},
-	{0x00, 0x20, 0x60, 0xA0, 0xE0, 0x20, 0x00, 0x00},
-	{0x00, 0xE0, 0x80, 0xC0, 0x20, 0xC0, 0x00, 0x00},
-	{0x00, 0x60, 0x80, 0xC0, 0xA0, 0x40, 0x00, 0x00},
-	{0x00, 0xE0, 0x20, 0x40, 0x40, 0x40, 0x00, 0x00},
-	{0x00, 0x40, 0xA0, 0x40, 0xA0, 0x40, 0x00, 0x00},
-	{0x00, 0x40, 0xA0, 0x60, 0x20, 0xC0, 0x00, 0x00},
-	{0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00},
-	{0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x80, 0x00},
-	{0x00, 0x20, 0x40, 0x80, 0x40, 0x20, 0x00, 0x00},
-	{0x00, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00},
-	{0x00, 0x80, 0x40, 0x20, 0x40, 0x80, 0x00, 0x00},
-	{0x40, 0xA0, 0x20, 0x40, 0x00, 0x40, 0x00, 0x00},
-	{0x40, 0xA0, 0x20, 0x60, 0xA0, 0x40, 0x00, 0x00},
-	{0x40, 0xA0, 0xA0, 0xE0, 0xA0, 0xA0, 0x00, 0x00},
-	{0xC0, 0xA0, 0xC0, 0xA0, 0xA0, 0xC0, 0x00, 0x00},
-	{0x60, 0x80, 0x80, 0x80, 0x80, 0x60, 0x00, 0x00},
-	{0xC0, 0xA0, 0xA0, 0xA0, 0xA0, 0xC0, 0x00, 0x00},
-	{0xE0, 0x80, 0xC0, 0x80, 0x80, 0xE0, 0x00, 0x00},
-	{0xE0, 0x80, 0xC0, 0x80, 0x80, 0x80, 0x00, 0x00},
-	{0x60, 0x80, 0x80, 0xA0, 0xA0, 0x60, 0x00, 0x00},
-	{0xA0, 0xA0, 0xA0, 0xE0, 0xA0, 0xA0, 0x00, 0x00},
-	{0xE0, 0x40, 0x40, 0x40, 0x40, 0xE0, 0x00, 0x00},
-	{0x20, 0x20, 0x20, 0x20, 0xA0, 0x40, 0x00, 0x00},
-	{0xA0, 0xA0, 0xC0, 0xA0, 0xA0, 0xA0, 0x00, 0x00},
-	{0x80, 0x80, 0x80, 0x80, 0x80, 0xE0, 0x00, 0x00},
-	{0xA0, 0xE0, 0xE0, 0xA0, 0xA0, 0xA0, 0x00, 0x00},
-	{0xC0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0x00, 0x00},
-	{0x40, 0xA0, 0xA0, 0xA0, 0xA0, 0x40, 0x00, 0x00},
-	{0xC0, 0xA0, 0xA0, 0xC0, 0x80, 0x80, 0x00, 0x00},
-	{0x40, 0xA0, 0xA0, 0xA0, 0xA0, 0x40, 0x20, 0x00},
-	{0xC0, 0xA0, 0xA0, 0xC0, 0xA0, 0xA0, 0x00, 0x00},
-	{0x60, 0x80, 0x40, 0x20, 0x20, 0xC0, 0x00, 0x00},
-	{0xE0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00},
-	{0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xE0, 0x00, 0x00},
-	{0xA0, 0xA0, 0xA0, 0xA0, 0xC0, 0x80, 0x00, 0x00},
-	{0xA0, 0xA0, 0xA0, 0xE0, 0xE0, 0xA0, 0x00, 0x00},
-	{0xA0, 0xA0, 0x40, 0x40, 0xA0, 0xA0, 0x00, 0x00},
-	{0xA0, 0xA0, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00},
-	{0xE0, 0x20, 0x40, 0x40, 0x80, 0xE0, 0x00, 0x00},
-	{0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x60, 0x00},
-	{0xA0, 0x40, 0xE0, 0x40, 0xE0, 0x40, 0x00, 0x00},
-	{0xC0, 0x40, 0x40, 0x40, 0x40, 0x40, 0xC0, 0x00},
-	{0x40, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00},
-	{0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x60, 0xA0, 0xA0, 0x60, 0x00, 0x00},
-	{0x80, 0x80, 0xC0, 0xA0, 0xA0, 0xC0, 0x00, 0x00},
-	{0x00, 0x00, 0x60, 0x80, 0x80, 0x60, 0x00, 0x00},
-	{0x20, 0x20, 0x60, 0xA0, 0xA0, 0x60, 0x00, 0x00},
-	{0x00, 0x00, 0x60, 0xE0, 0x80, 0x60, 0x00, 0x00},
-	{0x60, 0x40, 0xE0, 0x40, 0x40, 0x40, 0x00, 0x00},
-	{0x00, 0x00, 0x60, 0xA0, 0x60, 0x20, 0xC0, 0x00},
-	{0x80, 0x80, 0xC0, 0xA0, 0xA0, 0xA0, 0x00, 0x00},
-	{0x40, 0x00, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00},
-	{0x40, 0x00, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00},
-	{0x80, 0x80, 0xA0, 0xC0, 0xA0, 0xA0, 0x00, 0x00},
-	{0xC0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00},
-	{0x00, 0x00, 0xC0, 0xE0, 0xE0, 0xA0, 0x00, 0x00},
-	{0x00, 0x00, 0xC0, 0xA0, 0xA0, 0xA0, 0x00, 0x00},
-	{0x00, 0x00, 0x40, 0xA0, 0xA0, 0x40, 0x00, 0x00},
-	{0x00, 0x00, 0xC0, 0xA0, 0xA0, 0xC0, 0x80, 0x00},
-	{0x00, 0x00, 0x60, 0xA0, 0xA0, 0x60, 0x20, 0x00},
-	{0x00, 0x00, 0xA0, 0xC0, 0x80, 0x80, 0x00, 0x00},
-	{0x00, 0x00, 0x60, 0xC0, 0x60, 0xC0, 0x00, 0x00},
-	{0x00, 0x40, 0xE0, 0x40, 0x40, 0x60, 0x00, 0x00},
-	{0x00, 0x00, 0xA0, 0xA0, 0xA0, 0xE0, 0x00, 0x00},
-	{0x00, 0x00, 0xA0, 0xA0, 0xC0, 0x80, 0x00, 0x00},
-	{0x00, 0x00, 0xA0, 0xA0, 0xE0, 0xE0, 0x00, 0x00},
-	{0x00, 0x00, 0xA0, 0x40, 0x40, 0xA0, 0x00, 0x00},
-	{0x00, 0x00, 0xA0, 0xA0, 0x60, 0x20, 0xC0, 0x00},
-	{0x00, 0x00, 0xE0, 0x20, 0x40, 0xE0, 0x00, 0x00},
-	{0x20, 0x40, 0x40, 0x80, 0x40, 0x40, 0x20, 0x00},
-	{0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00},
-	{0x80, 0x40, 0x40, 0x20, 0x40, 0x40, 0x80, 0x00},
-	{0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+const uint8_t UTF8_1B_CODE_BITMAP[UTF8_1B_CODE_BITMAP_NUM][FONT_HALF_WIDTH * FONT_HEIGHT / 8] = {
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00},
+	{0x44, 0x44, 0x04, 0x00},
+	{0xAA, 0x00, 0x00, 0x00},
+	{0xAE, 0xAA, 0xEA, 0x00},
+	{0x4E, 0xC6, 0xE4, 0x00},
+	{0x08, 0x24, 0x82, 0x00},
+	{0x4A, 0x46, 0xCE, 0x00},
+	{0x48, 0x00, 0x00, 0x00},
+	{0x24, 0x44, 0x44, 0x20},
+	{0x84, 0x44, 0x44, 0x80},
+	{0x4E, 0x4A, 0x00, 0x00},
+	{0x04, 0x4E, 0x44, 0x00},
+	{0x00, 0x00, 0x04, 0x80},
+	{0x00, 0x0E, 0x00, 0x00},
+	{0x00, 0x00, 0x04, 0x00},
+	{0x00, 0x24, 0x80, 0x00},
+	{0x04, 0xAE, 0xA4, 0x00},
+	{0x04, 0xC4, 0x4E, 0x00},
+	{0x0C, 0x24, 0x8E, 0x00},
+	{0x0C, 0x24, 0x2C, 0x00},
+	{0x02, 0x6A, 0xE2, 0x00},
+	{0x0E, 0x8C, 0x2C, 0x00},
+	{0x06, 0x8C, 0xA4, 0x00},
+	{0x0E, 0x24, 0x44, 0x00},
+	{0x04, 0xA4, 0xA4, 0x00},
+	{0x04, 0xA6, 0x2C, 0x00},
+	{0x00, 0x40, 0x04, 0x00},
+	{0x00, 0x40, 0x04, 0x80},
+	{0x02, 0x48, 0x42, 0x00},
+	{0x00, 0xE0, 0xE0, 0x00},
+	{0x08, 0x42, 0x48, 0x00},
+	{0x4A, 0x24, 0x04, 0x00},
+	{0x4A, 0x26, 0xA4, 0x00},
+	{0x4A, 0xAE, 0xAA, 0x00},
+	{0xCA, 0xCA, 0xAC, 0x00},
+	{0x68, 0x88, 0x86, 0x00},
+	{0xCA, 0xAA, 0xAC, 0x00},
+	{0xE8, 0xC8, 0x8E, 0x00},
+	{0xE8, 0xC8, 0x88, 0x00},
+	{0x68, 0x8A, 0xA6, 0x00},
+	{0xAA, 0xAE, 0xAA, 0x00},
+	{0xE4, 0x44, 0x4E, 0x00},
+	{0x22, 0x22, 0xA4, 0x00},
+	{0xAA, 0xCA, 0xAA, 0x00},
+	{0x88, 0x88, 0x8E, 0x00},
+	{0xAE, 0xEA, 0xAA, 0x00},
+	{0xCA, 0xAA, 0xAA, 0x00},
+	{0x4A, 0xAA, 0xA4, 0x00},
+	{0xCA, 0xAC, 0x88, 0x00},
+	{0x4A, 0xAA, 0xA4, 0x20},
+	{0xCA, 0xAC, 0xAA, 0x00},
+	{0x68, 0x42, 0x2C, 0x00},
+	{0xE4, 0x44, 0x44, 0x00},
+	{0xAA, 0xAA, 0xAE, 0x00},
+	{0xAA, 0xAA, 0xC8, 0x00},
+	{0xAA, 0xAE, 0xEA, 0x00},
+	{0xAA, 0x44, 0xAA, 0x00},
+	{0xAA, 0x44, 0x44, 0x00},
+	{0xE2, 0x44, 0x8E, 0x00},
+	{0x64, 0x44, 0x44, 0x60},
+	{0xA4, 0xE4, 0xE4, 0x00},
+	{0xC4, 0x44, 0x44, 0xC0},
+	{0x4A, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0xE0},
+	{0x42, 0x00, 0x00, 0x00},
+	{0x00, 0x6A, 0xA6, 0x00},
+	{0x88, 0xCA, 0xAC, 0x00},
+	{0x00, 0x68, 0x86, 0x00},
+	{0x22, 0x6A, 0xA6, 0x00},
+	{0x00, 0x6E, 0x86, 0x00},
+	{0x64, 0xE4, 0x44, 0x00},
+	{0x00, 0x6A, 0x62, 0xC0},
+	{0x88, 0xCA, 0xAA, 0x00},
+	{0x40, 0x44, 0x44, 0x00},
+	{0x40, 0x44, 0x44, 0x80},
+	{0x88, 0xAC, 0xAA, 0x00},
+	{0xC4, 0x44, 0x44, 0x00},
+	{0x00, 0xCE, 0xEA, 0x00},
+	{0x00, 0xCA, 0xAA, 0x00},
+	{0x00, 0x4A, 0xA4, 0x00},
+	{0x00, 0xCA, 0xAC, 0x80},
+	{0x00, 0x6A, 0xA6, 0x20},
+	{0x00, 0xAC, 0x88, 0x00},
+	{0x00, 0x6C, 0x6C, 0x00},
+	{0x04, 0xE4, 0x46, 0x00},
+	{0x00, 0xAA, 0xAE, 0x00},
+	{0x00, 0xAA, 0xC8, 0x00},
+	{0x00, 0xAA, 0xEE, 0x00},
+	{0x00, 0xA4, 0x4A, 0x00},
+	{0x00, 0xAA, 0x62, 0xC0},
+	{0x00, 0xE2, 0x4E, 0x00},
+	{0x24, 0x48, 0x44, 0x20},
+	{0x44, 0x44, 0x44, 0x40},
+	{0x84, 0x42, 0x44, 0x80},
+	{0xE0, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0x00}
 };
 
 // 2バイトコード　1バイト目
-unsigned char Utf8CodeTable_2B_1st[UTF8_CODE_2B_1_NUM][2] = {
+const uint8_t Utf8CodeTable_2B_1st[UTF8_CODE_2B_1_NUM][2] = {
 	{0xC2,	0x06},
 	{0xC3,	0x02},
@@ -187,5 +187,5 @@
 };
 // 2バイトコード 2バイト目 bitmapデータ
-struct utf8_code_bitmap UTF8_2B_CODE_BITMAP[UTF8_2B_CODE_BITMAP_NUM] = {
+const struct utf8_code_bitmap UTF8_2B_CODE_BITMAP[UTF8_2B_CODE_BITMAP_NUM] = {
 	{0xA7,	{0x1C, 0x20, 0x18, 0x24, 0x18, 0x04, 0x38, 0x00}},
 	{0xA8,	{0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
@@ -313,5 +313,5 @@
 
 // 3バイトコード 1バイト目
-unsigned char Utf8CodeTable_3B_1st[UTF8_CODE_3B_1_NUM][2] = {
+const uint8_t Utf8CodeTable_3B_1st[UTF8_CODE_3B_1_NUM][2] = {
 	{0xE2,	0x0E},
 	{0xE3,	0x04},
@@ -325,5 +325,5 @@
 };
 // 3バイトコード 2バイト目
-unsigned char Utf8CodeTable_3B_2nd[UTF8_CODE_3B_2_NUM][2] = {
+const uint8_t Utf8CodeTable_3B_2nd[UTF8_CODE_3B_2_NUM][2] = {
 	{0x80,	0x0F},
 	{0x84,	0x02},
@@ -673,5 +673,5 @@
 
 // 3バイトコード 3バイト目 bitmapデータ
-struct utf8_code_bitmap UTF8_3B_CODE_BITMAP[UTF8_3B_CODE_BITMAP_NUM] = {
+const struct utf8_code_bitmap UTF8_3B_CODE_BITMAP[UTF8_3B_CODE_BITMAP_NUM] = {
 	{ 0x90 ,{0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00}},
 	{ 0x95 ,{0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00}},
