diff options
Diffstat (limited to 'firmware/drivers')
-rw-r--r-- | firmware/drivers/lcd-bitmap-common.c | 14 | ||||
-rw-r--r-- | firmware/drivers/lcd-charcell.c | 9 |
2 files changed, 3 insertions, 20 deletions
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index 2b309ba75a..00d317c9c8 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c | |||
@@ -624,19 +624,7 @@ void LCDFN(puts_scroll)(int x, int y, const unsigned char *string) | |||
624 | void LCDFN(puts_scroll_style)(int x, int y, const unsigned char *string, | 624 | void LCDFN(puts_scroll_style)(int x, int y, const unsigned char *string, |
625 | int style) | 625 | int style) |
626 | { | 626 | { |
627 | LCDFN(puts_scroll_style_offset)(x, y, string, style, 0); | 627 | LCDFN(puts_scroll_style_xyoffset)(x, y, string, style, 0, 0); |
628 | } | ||
629 | |||
630 | void LCDFN(puts_scroll_offset)(int x, int y, const unsigned char *string, | ||
631 | int offset) | ||
632 | { | ||
633 | LCDFN(puts_scroll_style_offset)(x, y, string, STYLE_DEFAULT, offset); | ||
634 | } | ||
635 | |||
636 | void LCDFN(puts_scroll_style_offset)(int x, int y, const unsigned char *string, | ||
637 | int style, int x_offset) | ||
638 | { | ||
639 | LCDFN(puts_scroll_style_xyoffset)(x, y, string, style, x_offset, 0); | ||
640 | } | 628 | } |
641 | 629 | ||
642 | #if !defined(HAVE_LCD_COLOR) || !defined(MAIN_LCD) | 630 | #if !defined(HAVE_LCD_COLOR) || !defined(MAIN_LCD) |
diff --git a/firmware/drivers/lcd-charcell.c b/firmware/drivers/lcd-charcell.c index 54159519a3..c3b1482a3b 100644 --- a/firmware/drivers/lcd-charcell.c +++ b/firmware/drivers/lcd-charcell.c | |||
@@ -509,10 +509,6 @@ void lcd_puts_offset(int x, int y, const unsigned char *str, int offset) | |||
509 | } | 509 | } |
510 | 510 | ||
511 | /** scrolling **/ | 511 | /** scrolling **/ |
512 | void lcd_puts_scroll(int x, int y, const unsigned char *string) | ||
513 | { | ||
514 | lcd_puts_scroll_offset(x, y, string, 0); | ||
515 | } | ||
516 | 512 | ||
517 | void lcd_puts_scroll_worker(int x, int y, const unsigned char *string, | 513 | void lcd_puts_scroll_worker(int x, int y, const unsigned char *string, |
518 | int offset, | 514 | int offset, |
@@ -586,8 +582,7 @@ void lcd_scroll_fn(struct scrollinfo* s) | |||
586 | } | 582 | } |
587 | } | 583 | } |
588 | 584 | ||
589 | void lcd_puts_scroll_offset(int x, int y, const unsigned char *string, | 585 | void lcd_puts_scroll(int x, int y, const unsigned char *string) |
590 | int offset) | ||
591 | { | 586 | { |
592 | lcd_puts_scroll_worker(x, y, string, offset, lcd_scroll_fn, NULL); | 587 | lcd_puts_scroll_worker(x, y, string, 0, lcd_scroll_fn, NULL); |
593 | } | 588 | } |