diff options
author | Thomas Martitz <kugel@rockbox.org> | 2013-04-13 18:17:16 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2014-01-07 14:13:48 +0100 |
commit | 8f64625888965d7eed46101fad8fc7fbd9e30f03 (patch) | |
tree | 35b41b514fbb9904e36763a7f425f42ff98e8dc7 /firmware/drivers/lcd-charcell.c | |
parent | a422604435bbb92b6d69552e347c8fa56c0830a2 (diff) | |
download | rockbox-8f64625888965d7eed46101fad8fc7fbd9e30f03.tar.gz rockbox-8f64625888965d7eed46101fad8fc7fbd9e30f03.zip |
lcd-common: Remove unused function lcd_puts_offset().
Change-Id: I39749bf3db915e5a8ddb6e6f25eb201ea0aaf981
Diffstat (limited to 'firmware/drivers/lcd-charcell.c')
-rw-r--r-- | firmware/drivers/lcd-charcell.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/firmware/drivers/lcd-charcell.c b/firmware/drivers/lcd-charcell.c index c3b1482a3b..6a6e57e992 100644 --- a/firmware/drivers/lcd-charcell.c +++ b/firmware/drivers/lcd-charcell.c | |||
@@ -477,10 +477,25 @@ void lcd_putsxyf(int x, int y, const unsigned char *fmt, ...) | |||
477 | 477 | ||
478 | /*** Line oriented text output ***/ | 478 | /*** Line oriented text output ***/ |
479 | 479 | ||
480 | /* Put a string at a given char position, skipping first offset chars */ | ||
481 | void lcd_putsofs(int x, int y, const unsigned char *str, int offset) | ||
482 | { | ||
483 | if ((unsigned)y >= (unsigned)current_vp->height) | ||
484 | return; | ||
485 | |||
486 | /* make sure scrolling is turned off on the line we are updating */ | ||
487 | lcd_scroll_stop_viewport_rect(current_vp, x, y, current_vp->width - x, 1); | ||
488 | |||
489 | x = lcd_putsxyofs(x, y, offset, str); | ||
490 | while (x < current_vp->width) | ||
491 | lcd_putxchar(x++, y, xspace); | ||
492 | } | ||
493 | |||
494 | |||
480 | /* Put a string at a given char position */ | 495 | /* Put a string at a given char position */ |
481 | void lcd_puts(int x, int y, const unsigned char *str) | 496 | void lcd_puts(int x, int y, const unsigned char *str) |
482 | { | 497 | { |
483 | lcd_puts_offset(x, y, str, 0); | 498 | lcd_putsofs(x, y, str, 0); |
484 | } | 499 | } |
485 | 500 | ||
486 | /* Formatting version of lcd_puts */ | 501 | /* Formatting version of lcd_puts */ |
@@ -494,20 +509,6 @@ void lcd_putsf(int x, int y, const unsigned char *fmt, ...) | |||
494 | lcd_puts(x, y, buf); | 509 | lcd_puts(x, y, buf); |
495 | } | 510 | } |
496 | 511 | ||
497 | /* Put a string at a given char position, skipping first offset chars */ | ||
498 | void lcd_puts_offset(int x, int y, const unsigned char *str, int offset) | ||
499 | { | ||
500 | if ((unsigned)y >= (unsigned)current_vp->height) | ||
501 | return; | ||
502 | |||
503 | /* make sure scrolling is turned off on the line we are updating */ | ||
504 | lcd_scroll_stop_viewport_rect(current_vp, x, y, current_vp->width - x, 1); | ||
505 | |||
506 | x = lcd_putsxyofs(x, y, offset, str); | ||
507 | while (x < current_vp->width) | ||
508 | lcd_putxchar(x++, y, xspace); | ||
509 | } | ||
510 | |||
511 | /** scrolling **/ | 512 | /** scrolling **/ |
512 | 513 | ||
513 | void lcd_puts_scroll_worker(int x, int y, const unsigned char *string, | 514 | void lcd_puts_scroll_worker(int x, int y, const unsigned char *string, |
@@ -529,7 +530,7 @@ void lcd_puts_scroll_worker(int x, int y, const unsigned char *string, | |||
529 | 530 | ||
530 | s->start_tick = current_tick + lcd_scroll_info.delay; | 531 | s->start_tick = current_tick + lcd_scroll_info.delay; |
531 | 532 | ||
532 | lcd_puts_offset(x, y, string, offset); | 533 | lcd_putsofs(x, y, string, offset); |
533 | len = utf8length(string); | 534 | len = utf8length(string); |
534 | 535 | ||
535 | if (current_vp->width - x >= len) | 536 | if (current_vp->width - x >= len) |