From 775ebe4ff6508d13712beb6bc18e546adb39f47d Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 14 Apr 2013 18:13:12 +0200 Subject: lcd-common/scroll_engine: Remove unused functions lcd_puts_scroll_style(). Change-Id: Ia4f943b3738ab6e66b0e3f1507c629b36d7eba94 --- firmware/drivers/lcd-bitmap-common.c | 9 ++------- firmware/export/lcd-remote.h | 2 -- firmware/export/lcd.h | 2 -- 3 files changed, 2 insertions(+), 11 deletions(-) (limited to 'firmware') diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index a95efbc1d8..14c63ec471 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c @@ -602,13 +602,8 @@ void LCDFN(putsxy_scroll_func)(int x, int y, const unsigned char *string, void LCDFN(puts_scroll)(int x, int y, const unsigned char *string) { - LCDFN(puts_scroll_style)(x, y, string, STYLE_DEFAULT); -} - -void LCDFN(puts_scroll_style)(int x, int y, const unsigned char *string, - int style) -{ - LCDFN(puts_scroll_style_xyoffset)(x, y, string, style, 0, 0); + LCDFN(puts_scroll_worker)(x, y, string, STYLE_DEFAULT, 0, 0, + true, LCDFN(scroll_fn), NULL); } #if !defined(HAVE_LCD_COLOR) || !defined(MAIN_LCD) diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h index 53ddf0fcea..4c0a894072 100644 --- a/firmware/export/lcd-remote.h +++ b/firmware/export/lcd-remote.h @@ -179,8 +179,6 @@ extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *st int style, int x_offset, int y_offset); extern void lcd_remote_putc(int x, int y, unsigned short ch); extern void lcd_remote_puts_scroll(int x, int y, const unsigned char *str); -extern void lcd_remote_puts_scroll_style(int x, int y, const unsigned char *str, - int style); extern void lcd_remote_puts_scroll_style_xyoffset(int x, int y, const unsigned char *string, int style, int x_offset, diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index b8c4f5ce1c..9e6470d526 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h @@ -208,8 +208,6 @@ extern void lcd_puts(int x, int y, const unsigned char *string); extern void lcd_putsf(int x, int y, const unsigned char *fmt, ...); extern void lcd_putc(int x, int y, unsigned long ucs); extern void lcd_puts_scroll(int x, int y, const unsigned char* string); -extern void lcd_puts_scroll_style(int x, int y, const unsigned char* string, - int style); extern void lcd_putsxy_scroll_func(int x, int y, const unsigned char *string, void (*scroll_func)(struct scrollinfo *), void *data, int x_offset); -- cgit v1.2.3