summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2013-04-11 12:07:06 +0200
committerThomas Martitz <kugel@rockbox.org>2014-01-07 14:13:48 +0100
commita422604435bbb92b6d69552e347c8fa56c0830a2 (patch)
tree0cb098327bf4450f0b2533b07e3d94fd3bde1917 /firmware
parent2ef9aa51f34263955bfa1528f6a4fd074b69ec91 (diff)
lcd-common/scroll_engine: Remove unused functions lcd_puts_scroll_offset() and lcd_puts_scroll_style_offset().
Change-Id: Ia84ae88020d06a1cb634942ab5e635fd5d10ac66
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/lcd-bitmap-common.c14
-rw-r--r--firmware/drivers/lcd-charcell.c9
-rw-r--r--firmware/export/lcd-remote.h5
-rw-r--r--firmware/export/lcd.h4
4 files changed, 3 insertions, 29 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)
void LCDFN(puts_scroll_style)(int x, int y, const unsigned char *string,
int style)
{
- LCDFN(puts_scroll_style_offset)(x, y, string, style, 0);
-}
-
-void LCDFN(puts_scroll_offset)(int x, int y, const unsigned char *string,
- int offset)
-{
- LCDFN(puts_scroll_style_offset)(x, y, string, STYLE_DEFAULT, offset);
-}
-
-void LCDFN(puts_scroll_style_offset)(int x, int y, const unsigned char *string,
- int style, int x_offset)
-{
- LCDFN(puts_scroll_style_xyoffset)(x, y, string, style, x_offset, 0);
+ LCDFN(puts_scroll_style_xyoffset)(x, y, string, style, 0, 0);
}
#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)
}
/** scrolling **/
-void lcd_puts_scroll(int x, int y, const unsigned char *string)
-{
- lcd_puts_scroll_offset(x, y, string, 0);
-}
void lcd_puts_scroll_worker(int x, int y, const unsigned char *string,
int offset,
@@ -586,8 +582,7 @@ void lcd_scroll_fn(struct scrollinfo* s)
}
}
-void lcd_puts_scroll_offset(int x, int y, const unsigned char *string,
- int offset)
+void lcd_puts_scroll(int x, int y, const unsigned char *string)
{
- lcd_puts_scroll_worker(x, y, string, offset, lcd_scroll_fn, NULL);
+ lcd_puts_scroll_worker(x, y, string, 0, lcd_scroll_fn, NULL);
}
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index f209e6b47d..5eb08b618f 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -187,11 +187,6 @@ 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_offset(int x, int y,
- const unsigned char *str, int offset);
-extern void lcd_remote_puts_scroll_style_offset(int x, int y,
- const unsigned char *string,
- int style, int offset);
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 af32b796be..dd7c3ba80f 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_puts_style(int x, int y, const unsigned char *string, int style);
extern void lcd_puts_offset(int x, int y, const unsigned char *str, int offset);
-extern void lcd_puts_scroll_offset(int x, int y, const unsigned char *string,
- int offset);
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,
@@ -506,8 +504,6 @@ extern void lcd_puts_style_offset(int x, int y, const unsigned char *str,
int style, int x_offset);
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_offset(int x, int y, const unsigned char *string,
- int style, int x_offset);
extern void lcd_puts_scroll_style_xyoffset(int x, int y, const unsigned char *string,
int style, int x_offset, int y_offset);