From 9a4686b563ac9e27615e1032792bd9878bb291f7 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 14 Apr 2013 18:15:09 +0200 Subject: lcd-common/scroll_engine: Remove unused functions lcd_puts_style_xyoffset() and lcd_puts_scroll_style_xyoffset(). With this functions removed there is no exported function in firmware left that draws line decorations. Also no function supports specifying an y-offset anymore (was used for pixel accurate positioning of otherwise strictly line-based API calls). Both should be handled in apps/ now. Change-Id: Iba4b28ccc6e686c7db63e34b51ad4badae983fce --- firmware/drivers/lcd-bitmap-common.c | 11 ++--------- firmware/export/lcd-remote.h | 6 ------ firmware/export/lcd.h | 5 ----- 3 files changed, 2 insertions(+), 20 deletions(-) (limited to 'firmware') diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index 14c63ec471..330639fd87 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c @@ -445,7 +445,7 @@ static void LCDFN(putsxyofs_style)(int xpos, int ypos, /*** Line oriented text output ***/ -void LCDFN(puts_style_xyoffset)(int x, int y, const unsigned char *str, +static void LCDFN(putsofs_style)(int x, int y, const unsigned char *str, int style, int x_offset, int y_offset) { int xpos, ypos, h; @@ -469,7 +469,7 @@ void LCDFN(puts_style_xyoffset)(int x, int y, const unsigned char *str, void LCDFN(puts)(int x, int y, const unsigned char *str) { - LCDFN(puts_style_xyoffset)(x, y, str, STYLE_DEFAULT, 0, 0); + LCDFN(putsofs_style)(x, y, str, STYLE_DEFAULT, 0, 0); } /* Formatting version of LCDFN(puts) */ @@ -582,13 +582,6 @@ static void LCDFN(puts_scroll_worker)(int x, int y, const unsigned char *string, } } -void LCDFN(puts_scroll_style_xyoffset)(int x, int y, const unsigned char *string, - int style, int x_offset, int y_offset) -{ - LCDFN(puts_scroll_worker)(x, y, string, style, x_offset, y_offset, - true, LCDFN(scroll_fn), NULL); -} - void LCDFN(putsxy_scroll_func)(int x, int y, const unsigned char *string, void (*scroll_func)(struct scrollinfo *), void *data, int x_offset) diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h index 4c0a894072..bc26a23cb7 100644 --- a/firmware/export/lcd-remote.h +++ b/firmware/export/lcd-remote.h @@ -175,14 +175,8 @@ extern void lcd_remote_clear_display(void); extern void lcd_remote_clear_viewport(void); extern void lcd_remote_puts(int x, int y, const unsigned char *str); extern void lcd_remote_putsf(int x, int y, const unsigned char *fmt, ...); -extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *str, - 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_xyoffset(int x, int y, - const unsigned char *string, - int style, int x_offset, - int y_offset); extern void lcd_remote_putsxy_scroll_func(int x, int y, const unsigned char *string, void (*scroll_func)(struct scrollinfo *), void *data, int x_offset); diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 9e6470d526..afdc5cf45e 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h @@ -496,11 +496,6 @@ extern int lcd_get_drawmode(void); extern void lcd_setfont(int font); extern int lcd_getfont(void); -extern void lcd_puts_style_xyoffset(int x, int y, const unsigned char *str, - int style, int x_offset, int y_offset); -extern void lcd_puts_scroll_style_xyoffset(int x, int y, const unsigned char *string, - int style, int x_offset, int y_offset); - /* low level drawing function pointer arrays */ #if LCD_DEPTH >= 8 extern lcd_fastpixelfunc_type* const *lcd_fastpixelfuncs; -- cgit v1.2.3