From 1e324aac36c123340d8d33338042402164581860 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sat, 13 Apr 2013 18:19:55 +0200 Subject: [PATCH] lcd-common: Remove unused function lcd_puts_style(). Change-Id: Id2c64c116f79b8e61a7af49b9072b3e884ffb455 --- apps/plugin.c | 2 -- apps/plugin.h | 2 -- docs/PLUGIN_API | 14 ++------------ firmware/drivers/lcd-bitmap-common.c | 5 ----- firmware/export/lcd-remote.h | 2 -- firmware/export/lcd.h | 1 - 6 files changed, 2 insertions(+), 24 deletions(-) diff --git a/apps/plugin.c b/apps/plugin.c index d80e6a1e0e..eed3be7291 100644 --- a/apps/plugin.c +++ b/apps/plugin.c @@ -200,7 +200,6 @@ static const struct plugin_api rockbox_api = { lcd_blit_pal256, lcd_pal256_update_pal, #endif - lcd_puts_style, lcd_puts_scroll_style, #ifdef HAVE_LCD_INVERT lcd_set_invert_display, @@ -260,7 +259,6 @@ static const struct plugin_api rockbox_api = { lcd_remote_mono_bitmap_part, lcd_remote_mono_bitmap, lcd_remote_putsxy, - lcd_remote_puts_style, lcd_remote_puts_scroll_style, &lcd_remote_static_framebuffer[0][0], lcd_remote_update, diff --git a/apps/plugin.h b/apps/plugin.h index 4e6f4a8c4e..237d2f82ee 100644 --- a/apps/plugin.h +++ b/apps/plugin.h @@ -269,7 +269,6 @@ struct plugin_api { int width, int height); void (*lcd_pal256_update_pal)(fb_data *palette); #endif - void (*lcd_puts_style)(int x, int y, const unsigned char *str, int style); void (*lcd_puts_scroll_style)(int x, int y, const unsigned char* string, int style); #ifdef HAVE_LCD_INVERT @@ -347,7 +346,6 @@ struct plugin_api { void (*lcd_remote_mono_bitmap)(const unsigned char *src, int x, int y, int width, int height); void (*lcd_remote_putsxy)(int x, int y, const unsigned char *string); - void (*lcd_remote_puts_style)(int x, int y, const unsigned char *str, int style); void (*lcd_remote_puts_scroll_style)(int x, int y, const unsigned char* string, int style); fb_remote_data* lcd_remote_framebuffer; diff --git a/docs/PLUGIN_API b/docs/PLUGIN_API index 75c82d447b..b895876bc0 100644 --- a/docs/PLUGIN_API +++ b/docs/PLUGIN_API @@ -1103,23 +1103,13 @@ void lcd_puts_scroll(int x, int y, const unsigned char* string) \description Puts scrolling string on the LCD at row =x= and column =y=. The scrolling style is STYLE_DEFAULT. void lcd_puts_scroll_style(int x, int y, const unsigned char* string, int style) - \group lcd - \conditions !defined(HAVE_LCD_CHARCELLS) - \param x - \param y - \param string - \param style - \description Same as lcd_puts_style, but with scrolling is enabled - \see lcd_puts_style - -void lcd_puts_style(int x, int y, const unsigned char *str, int style) \group lcd \conditions !defined(HAVE_LCD_CHARCELLS) \param x Row X \param y Column Y - \param str + \param string \param style can be STYLE_DEFAULT for black text display or STYLE_INVERT for white text display - \description Put a string at row =x= and column =y= + \description Put a string at row =x= and column =y=, the text scrolls if necessary void lcd_put_cursor(int x, int y, unsigned long ucs) \group lcd diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index 2219b6de78..f9bc03d48e 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c @@ -489,11 +489,6 @@ void LCDFN(putsf)(int x, int y, const unsigned char *fmt, ...) LCDFN(puts)(x, y, buf); } -void LCDFN(puts_style)(int x, int y, const unsigned char *str, int style) -{ - LCDFN(puts_style_offset)(x, y, str, style, 0); -} - /*** scrolling ***/ static struct scrollinfo* find_scrolling_line(int x, int y) diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h index 347a46e8bd..d803525318 100644 --- a/firmware/export/lcd-remote.h +++ b/firmware/export/lcd-remote.h @@ -175,8 +175,6 @@ 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(int x, int y, const unsigned char *str, - int style); extern void lcd_remote_puts_style_offset(int x, int y, const unsigned char *str, int style, int offset); extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *str, diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 7c361d4097..0c5cf74ac7 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h @@ -206,7 +206,6 @@ extern void lcd_putsxy_style_offset(int x, int y, const unsigned char *str, int style, int offset); 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_puts_style(int x, int y, const unsigned char *string, int style); 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,