From 1ef2d660523d37c57322f9c6fb3ecbdb35eca057 Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Tue, 11 Jun 2002 10:36:50 +0000 Subject: Changed to new chartable arrays git-svn-id: svn://svn.rockbox.org/rockbox/trunk@954 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/lcd.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'firmware/drivers') diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c index b7e4cc70fa..0631fedc68 100644 --- a/firmware/drivers/lcd.c +++ b/firmware/drivers/lcd.c @@ -414,9 +414,9 @@ static int ymargin=0; #define ASCII_MIN 0x20 /* First char in table */ #define ASCII_MAX 0x7f /* Last char in table */ -extern unsigned char char_gen_6x8[][5][1]; -extern unsigned char char_gen_8x12[][7][2]; -extern unsigned char char_gen_12x16[][11][2]; +extern unsigned char char_gen_6x8[][5]; +extern unsigned char char_gen_8x12[][14]; +extern unsigned char char_gen_12x16[][22]; /* All zeros and ones bitmaps for area filling */ static unsigned char zeros[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -433,6 +433,8 @@ static char fontheight[] = { 8,12,16 }; */ void lcd_init (void) { + int i; + /* Initialize PB0-3 as output pins */ PBCR2 &= 0xff00; /* MD = 00 */ PBIOR |= 0x000f; /* IOR = 1 */ @@ -550,11 +552,11 @@ void lcd_putsxy(int x, int y, char *str, int thisfont) ch -= ASCII_MIN; if (thisfont == 2) - src = char_gen_12x16[ch][0]; + src = char_gen_12x16[ch]; else if (thisfont == 1) - src = char_gen_8x12[ch][0]; + src = char_gen_8x12[ch]; else - src = char_gen_6x8[ch][0]; + src = char_gen_6x8[ch]; lcd_bitmap (src, lcd_x, lcd_y, nx-1, ny, true); lcd_bitmap (zeros, lcd_x+nx-1, lcd_y, 1, ny, true); -- cgit v1.2.3