diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-06-11 10:36:50 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-06-11 10:36:50 +0000 |
commit | 1ef2d660523d37c57322f9c6fb3ecbdb35eca057 (patch) | |
tree | d8a1cf0bcc677ee478353aa0c164a83e2e56fb9e /firmware/drivers/lcd.c | |
parent | 083e5dbe14cbd5c27f733b5b59a103634fb7864e (diff) | |
download | rockbox-1ef2d660523d37c57322f9c6fb3ecbdb35eca057.tar.gz rockbox-1ef2d660523d37c57322f9c6fb3ecbdb35eca057.zip |
Changed to new chartable arrays
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@954 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/lcd.c')
-rw-r--r-- | firmware/drivers/lcd.c | 14 |
1 files changed, 8 insertions, 6 deletions
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; | |||
414 | #define ASCII_MIN 0x20 /* First char in table */ | 414 | #define ASCII_MIN 0x20 /* First char in table */ |
415 | #define ASCII_MAX 0x7f /* Last char in table */ | 415 | #define ASCII_MAX 0x7f /* Last char in table */ |
416 | 416 | ||
417 | extern unsigned char char_gen_6x8[][5][1]; | 417 | extern unsigned char char_gen_6x8[][5]; |
418 | extern unsigned char char_gen_8x12[][7][2]; | 418 | extern unsigned char char_gen_8x12[][14]; |
419 | extern unsigned char char_gen_12x16[][11][2]; | 419 | extern unsigned char char_gen_12x16[][22]; |
420 | 420 | ||
421 | /* All zeros and ones bitmaps for area filling */ | 421 | /* All zeros and ones bitmaps for area filling */ |
422 | static unsigned char zeros[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 422 | static unsigned char zeros[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
@@ -433,6 +433,8 @@ static char fontheight[] = { 8,12,16 }; | |||
433 | */ | 433 | */ |
434 | void lcd_init (void) | 434 | void lcd_init (void) |
435 | { | 435 | { |
436 | int i; | ||
437 | |||
436 | /* Initialize PB0-3 as output pins */ | 438 | /* Initialize PB0-3 as output pins */ |
437 | PBCR2 &= 0xff00; /* MD = 00 */ | 439 | PBCR2 &= 0xff00; /* MD = 00 */ |
438 | PBIOR |= 0x000f; /* IOR = 1 */ | 440 | PBIOR |= 0x000f; /* IOR = 1 */ |
@@ -550,11 +552,11 @@ void lcd_putsxy(int x, int y, char *str, int thisfont) | |||
550 | ch -= ASCII_MIN; | 552 | ch -= ASCII_MIN; |
551 | 553 | ||
552 | if (thisfont == 2) | 554 | if (thisfont == 2) |
553 | src = char_gen_12x16[ch][0]; | 555 | src = char_gen_12x16[ch]; |
554 | else if (thisfont == 1) | 556 | else if (thisfont == 1) |
555 | src = char_gen_8x12[ch][0]; | 557 | src = char_gen_8x12[ch]; |
556 | else | 558 | else |
557 | src = char_gen_6x8[ch][0]; | 559 | src = char_gen_6x8[ch]; |
558 | 560 | ||
559 | lcd_bitmap (src, lcd_x, lcd_y, nx-1, ny, true); | 561 | lcd_bitmap (src, lcd_x, lcd_y, nx-1, ny, true); |
560 | lcd_bitmap (zeros, lcd_x+nx-1, lcd_y, 1, ny, true); | 562 | lcd_bitmap (zeros, lcd_x+nx-1, lcd_y, 1, ny, true); |