summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2013-04-14 18:13:12 +0200
committerThomas Martitz <kugel@rockbox.org>2014-01-07 14:13:48 +0100
commit775ebe4ff6508d13712beb6bc18e546adb39f47d (patch)
treeed627a0b18815e50ef6843fc3d9ad350503eb006
parent7cd07290e6fc21ab8b2b6d438d7a6b24b3708e35 (diff)
downloadrockbox-775ebe4ff6508d13712beb6bc18e546adb39f47d.tar.gz
rockbox-775ebe4ff6508d13712beb6bc18e546adb39f47d.tar.bz2
rockbox-775ebe4ff6508d13712beb6bc18e546adb39f47d.zip
lcd-common/scroll_engine: Remove unused functions lcd_puts_scroll_style().
Change-Id: Ia4f943b3738ab6e66b0e3f1507c629b36d7eba94
-rw-r--r--apps/plugin.c2
-rw-r--r--apps/plugin.h4
-rw-r--r--apps/screen_access.c2
-rw-r--r--apps/screen_access.h2
-rw-r--r--docs/PLUGIN_API18
-rw-r--r--firmware/drivers/lcd-bitmap-common.c9
-rw-r--r--firmware/export/lcd-remote.h2
-rw-r--r--firmware/export/lcd.h2
8 files changed, 2 insertions, 39 deletions
diff --git a/apps/plugin.c b/apps/plugin.c
index eed3be7291..af06a4c484 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_scroll_style,
#ifdef HAVE_LCD_INVERT
lcd_set_invert_display,
#endif /* HAVE_LCD_INVERT */
@@ -259,7 +258,6 @@ static const struct plugin_api rockbox_api = {
lcd_remote_mono_bitmap_part,
lcd_remote_mono_bitmap,
lcd_remote_putsxy,
- lcd_remote_puts_scroll_style,
&lcd_remote_static_framebuffer[0][0],
lcd_remote_update,
lcd_remote_update_rect,
diff --git a/apps/plugin.h b/apps/plugin.h
index 237d2f82ee..673ad0b8c1 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -269,8 +269,6 @@ struct plugin_api {
int width, int height);
void (*lcd_pal256_update_pal)(fb_data *palette);
#endif
- void (*lcd_puts_scroll_style)(int x, int y, const unsigned char* string,
- int style);
#ifdef HAVE_LCD_INVERT
void (*lcd_set_invert_display)(bool yesno);
#endif /* HAVE_LCD_INVERT */
@@ -346,8 +344,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_scroll_style)(int x, int y, const unsigned char* string,
- int style);
fb_remote_data* lcd_remote_framebuffer;
void (*lcd_remote_update)(void);
void (*lcd_remote_update_rect)(int x, int y, int width, int height);
diff --git a/apps/screen_access.c b/apps/screen_access.c
index 452e5e9501..7ca6f8d310 100644
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@@ -249,7 +249,6 @@ struct screen screens[NB_SCREENS] =
.hline=&lcd_hline,
.scroll_step=&lcd_scroll_step,
.puts_style_xyoffset=&lcd_puts_style_xyoffset,
- .puts_scroll_style=&lcd_puts_scroll_style,
.puts_scroll_style_xyoffset=&lcd_puts_scroll_style_xyoffset,
#endif /* HAVE_LCD_BITMAP */
@@ -351,7 +350,6 @@ struct screen screens[NB_SCREENS] =
.hline=&lcd_remote_hline,
.scroll_step=&lcd_remote_scroll_step,
.puts_style_xyoffset=&lcd_remote_puts_style_xyoffset,
- .puts_scroll_style=&lcd_remote_puts_scroll_style,
.puts_scroll_style_xyoffset=&lcd_remote_puts_scroll_style_xyoffset,
#endif /* 1 */
diff --git a/apps/screen_access.h b/apps/screen_access.h
index 4f1faac187..933a4dc692 100644
--- a/apps/screen_access.h
+++ b/apps/screen_access.h
@@ -80,8 +80,6 @@ struct screen
void (*scroll_step)(int pixels);
void (*puts_style_xyoffset)(int x, int y, const unsigned char *str,
int style, int x_offset, int y_offset);
- void (*puts_scroll_style)(int x, int y, const unsigned char *string,
- int style);
void (*puts_scroll_style_xyoffset)(int x, int y, const unsigned char *string,
int style, int x_offset, int y_offset);
void (*mono_bitmap)(const unsigned char *src,
diff --git a/docs/PLUGIN_API b/docs/PLUGIN_API
index b895876bc0..768342bd80 100644
--- a/docs/PLUGIN_API
+++ b/docs/PLUGIN_API
@@ -1102,15 +1102,6 @@ void lcd_puts_scroll(int x, int y, const unsigned char* string)
\param 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 Row X
- \param y Column Y
- \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=, the text scrolls if necessary
-
void lcd_put_cursor(int x, int y, unsigned long ucs)
\group lcd
\conditions (defined(HAVE_LCD_CHARCELLS))
@@ -1266,15 +1257,6 @@ void lcd_remote_puts_scroll(int x, int y, const unsigned char* string)
\param string
\description
-void lcd_remote_puts_scroll_style(int x, int y, const unsigned char* string, int style)
- \group remote lcd
- \conditions (defined(HAVE_REMOTE_LCD))
- \param x
- \param y
- \param string
- \param style
- \description
-
void lcd_remote_puts_style(int x, int y, const unsigned char *str, int style)
\group remote lcd
\conditions (defined(HAVE_REMOTE_LCD))
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);