diff options
author | Thomas Martitz <kugel@rockbox.org> | 2013-04-11 12:07:06 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2014-01-07 14:13:48 +0100 |
commit | a422604435bbb92b6d69552e347c8fa56c0830a2 (patch) | |
tree | 0cb098327bf4450f0b2533b07e3d94fd3bde1917 | |
parent | 2ef9aa51f34263955bfa1528f6a4fd074b69ec91 (diff) | |
download | rockbox-a422604435bbb92b6d69552e347c8fa56c0830a2.tar.gz rockbox-a422604435bbb92b6d69552e347c8fa56c0830a2.zip |
lcd-common/scroll_engine: Remove unused functions lcd_puts_scroll_offset() and lcd_puts_scroll_style_offset().
Change-Id: Ia84ae88020d06a1cb634942ab5e635fd5d10ac66
-rw-r--r-- | apps/screen_access.c | 4 | ||||
-rw-r--r-- | apps/screen_access.h | 4 | ||||
-rw-r--r-- | firmware/drivers/lcd-bitmap-common.c | 14 | ||||
-rw-r--r-- | firmware/drivers/lcd-charcell.c | 9 | ||||
-rw-r--r-- | firmware/export/lcd-remote.h | 5 | ||||
-rw-r--r-- | firmware/export/lcd.h | 4 |
6 files changed, 3 insertions, 37 deletions
diff --git a/apps/screen_access.c b/apps/screen_access.c index 81bb6bae8f..7ebc45b8fd 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c | |||
@@ -251,7 +251,6 @@ struct screen screens[NB_SCREENS] = | |||
251 | .puts_style_offset=&lcd_puts_style_offset, | 251 | .puts_style_offset=&lcd_puts_style_offset, |
252 | .puts_style_xyoffset=&lcd_puts_style_xyoffset, | 252 | .puts_style_xyoffset=&lcd_puts_style_xyoffset, |
253 | .puts_scroll_style=&lcd_puts_scroll_style, | 253 | .puts_scroll_style=&lcd_puts_scroll_style, |
254 | .puts_scroll_style_offset=&lcd_puts_scroll_style_offset, | ||
255 | .puts_scroll_style_xyoffset=&lcd_puts_scroll_style_xyoffset, | 254 | .puts_scroll_style_xyoffset=&lcd_puts_scroll_style_xyoffset, |
256 | #endif /* HAVE_LCD_BITMAP */ | 255 | #endif /* HAVE_LCD_BITMAP */ |
257 | 256 | ||
@@ -269,7 +268,6 @@ struct screen screens[NB_SCREENS] = | |||
269 | .putsf=&lcd_putsf, | 268 | .putsf=&lcd_putsf, |
270 | .puts_offset=&lcd_puts_offset, | 269 | .puts_offset=&lcd_puts_offset, |
271 | .puts_scroll=&lcd_puts_scroll, | 270 | .puts_scroll=&lcd_puts_scroll, |
272 | .puts_scroll_offset=&lcd_puts_scroll_offset, | ||
273 | .putsxy_scroll_func=&lcd_putsxy_scroll_func, | 271 | .putsxy_scroll_func=&lcd_putsxy_scroll_func, |
274 | .scroll_speed=&lcd_scroll_speed, | 272 | .scroll_speed=&lcd_scroll_speed, |
275 | .scroll_delay=&lcd_scroll_delay, | 273 | .scroll_delay=&lcd_scroll_delay, |
@@ -357,7 +355,6 @@ struct screen screens[NB_SCREENS] = | |||
357 | .puts_style_offset=&lcd_remote_puts_style_offset, | 355 | .puts_style_offset=&lcd_remote_puts_style_offset, |
358 | .puts_style_xyoffset=&lcd_remote_puts_style_xyoffset, | 356 | .puts_style_xyoffset=&lcd_remote_puts_style_xyoffset, |
359 | .puts_scroll_style=&lcd_remote_puts_scroll_style, | 357 | .puts_scroll_style=&lcd_remote_puts_scroll_style, |
360 | .puts_scroll_style_offset=&lcd_remote_puts_scroll_style_offset, | ||
361 | .puts_scroll_style_xyoffset=&lcd_remote_puts_scroll_style_xyoffset, | 358 | .puts_scroll_style_xyoffset=&lcd_remote_puts_scroll_style_xyoffset, |
362 | #endif /* 1 */ | 359 | #endif /* 1 */ |
363 | 360 | ||
@@ -373,7 +370,6 @@ struct screen screens[NB_SCREENS] = | |||
373 | .putsf=&lcd_remote_putsf, | 370 | .putsf=&lcd_remote_putsf, |
374 | .puts_offset=&lcd_remote_puts_offset, | 371 | .puts_offset=&lcd_remote_puts_offset, |
375 | .puts_scroll=&lcd_remote_puts_scroll, | 372 | .puts_scroll=&lcd_remote_puts_scroll, |
376 | .puts_scroll_offset=&lcd_remote_puts_scroll_offset, | ||
377 | .putsxy_scroll_func=&lcd_remote_putsxy_scroll_func, | 373 | .putsxy_scroll_func=&lcd_remote_putsxy_scroll_func, |
378 | .scroll_speed=&lcd_remote_scroll_speed, | 374 | .scroll_speed=&lcd_remote_scroll_speed, |
379 | .scroll_delay=&lcd_remote_scroll_delay, | 375 | .scroll_delay=&lcd_remote_scroll_delay, |
diff --git a/apps/screen_access.h b/apps/screen_access.h index 7bc9c35237..c21d9cdb63 100644 --- a/apps/screen_access.h +++ b/apps/screen_access.h | |||
@@ -84,8 +84,6 @@ struct screen | |||
84 | int style, int x_offset, int y_offset); | 84 | int style, int x_offset, int y_offset); |
85 | void (*puts_scroll_style)(int x, int y, const unsigned char *string, | 85 | void (*puts_scroll_style)(int x, int y, const unsigned char *string, |
86 | int style); | 86 | int style); |
87 | void (*puts_scroll_style_offset)(int x, int y, const unsigned char *string, | ||
88 | int style, int x_offset); | ||
89 | void (*puts_scroll_style_xyoffset)(int x, int y, const unsigned char *string, | 87 | void (*puts_scroll_style_xyoffset)(int x, int y, const unsigned char *string, |
90 | int style, int x_offset, int y_offset); | 88 | int style, int x_offset, int y_offset); |
91 | void (*mono_bitmap)(const unsigned char *src, | 89 | void (*mono_bitmap)(const unsigned char *src, |
@@ -143,8 +141,6 @@ struct screen | |||
143 | void (*putsf)(int x, int y, const unsigned char *str, ...); | 141 | void (*putsf)(int x, int y, const unsigned char *str, ...); |
144 | void (*puts_offset)(int x, int y, const unsigned char *str, int offset); | 142 | void (*puts_offset)(int x, int y, const unsigned char *str, int offset); |
145 | void (*puts_scroll)(int x, int y, const unsigned char *string); | 143 | void (*puts_scroll)(int x, int y, const unsigned char *string); |
146 | void (*puts_scroll_offset)(int x, int y, const unsigned char *string, | ||
147 | int x_offset); | ||
148 | void (*putsxy_scroll_func)(int x, int y, const unsigned char *string, | 144 | void (*putsxy_scroll_func)(int x, int y, const unsigned char *string, |
149 | void (*scroll_func)(struct scrollinfo *), | 145 | void (*scroll_func)(struct scrollinfo *), |
150 | void *data, int x_offset); | 146 | void *data, int x_offset); |
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) | |||
624 | void LCDFN(puts_scroll_style)(int x, int y, const unsigned char *string, | 624 | void LCDFN(puts_scroll_style)(int x, int y, const unsigned char *string, |
625 | int style) | 625 | int style) |
626 | { | 626 | { |
627 | LCDFN(puts_scroll_style_offset)(x, y, string, style, 0); | 627 | LCDFN(puts_scroll_style_xyoffset)(x, y, string, style, 0, 0); |
628 | } | ||
629 | |||
630 | void LCDFN(puts_scroll_offset)(int x, int y, const unsigned char *string, | ||
631 | int offset) | ||
632 | { | ||
633 | LCDFN(puts_scroll_style_offset)(x, y, string, STYLE_DEFAULT, offset); | ||
634 | } | ||
635 | |||
636 | void LCDFN(puts_scroll_style_offset)(int x, int y, const unsigned char *string, | ||
637 | int style, int x_offset) | ||
638 | { | ||
639 | LCDFN(puts_scroll_style_xyoffset)(x, y, string, style, x_offset, 0); | ||
640 | } | 628 | } |
641 | 629 | ||
642 | #if !defined(HAVE_LCD_COLOR) || !defined(MAIN_LCD) | 630 | #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) | |||
509 | } | 509 | } |
510 | 510 | ||
511 | /** scrolling **/ | 511 | /** scrolling **/ |
512 | void lcd_puts_scroll(int x, int y, const unsigned char *string) | ||
513 | { | ||
514 | lcd_puts_scroll_offset(x, y, string, 0); | ||
515 | } | ||
516 | 512 | ||
517 | void lcd_puts_scroll_worker(int x, int y, const unsigned char *string, | 513 | void lcd_puts_scroll_worker(int x, int y, const unsigned char *string, |
518 | int offset, | 514 | int offset, |
@@ -586,8 +582,7 @@ void lcd_scroll_fn(struct scrollinfo* s) | |||
586 | } | 582 | } |
587 | } | 583 | } |
588 | 584 | ||
589 | void lcd_puts_scroll_offset(int x, int y, const unsigned char *string, | 585 | void lcd_puts_scroll(int x, int y, const unsigned char *string) |
590 | int offset) | ||
591 | { | 586 | { |
592 | lcd_puts_scroll_worker(x, y, string, offset, lcd_scroll_fn, NULL); | 587 | lcd_puts_scroll_worker(x, y, string, 0, lcd_scroll_fn, NULL); |
593 | } | 588 | } |
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); | |||
187 | extern void lcd_remote_puts_scroll(int x, int y, const unsigned char *str); | 187 | extern void lcd_remote_puts_scroll(int x, int y, const unsigned char *str); |
188 | extern void lcd_remote_puts_scroll_style(int x, int y, const unsigned char *str, | 188 | extern void lcd_remote_puts_scroll_style(int x, int y, const unsigned char *str, |
189 | int style); | 189 | int style); |
190 | extern void lcd_remote_puts_scroll_offset(int x, int y, | ||
191 | const unsigned char *str, int offset); | ||
192 | extern void lcd_remote_puts_scroll_style_offset(int x, int y, | ||
193 | const unsigned char *string, | ||
194 | int style, int offset); | ||
195 | extern void lcd_remote_puts_scroll_style_xyoffset(int x, int y, | 190 | extern void lcd_remote_puts_scroll_style_xyoffset(int x, int y, |
196 | const unsigned char *string, | 191 | const unsigned char *string, |
197 | int style, int x_offset, | 192 | 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); | |||
208 | extern void lcd_putsf(int x, int y, const unsigned char *fmt, ...); | 208 | extern void lcd_putsf(int x, int y, const unsigned char *fmt, ...); |
209 | extern void lcd_puts_style(int x, int y, const unsigned char *string, int style); | 209 | extern void lcd_puts_style(int x, int y, const unsigned char *string, int style); |
210 | extern void lcd_puts_offset(int x, int y, const unsigned char *str, int offset); | 210 | extern void lcd_puts_offset(int x, int y, const unsigned char *str, int offset); |
211 | extern void lcd_puts_scroll_offset(int x, int y, const unsigned char *string, | ||
212 | int offset); | ||
213 | extern void lcd_putc(int x, int y, unsigned long ucs); | 211 | extern void lcd_putc(int x, int y, unsigned long ucs); |
214 | extern void lcd_puts_scroll(int x, int y, const unsigned char* string); | 212 | extern void lcd_puts_scroll(int x, int y, const unsigned char* string); |
215 | extern void lcd_puts_scroll_style(int x, int y, const unsigned char* string, | 213 | 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, | |||
506 | int style, int x_offset); | 504 | int style, int x_offset); |
507 | extern void lcd_puts_style_xyoffset(int x, int y, const unsigned char *str, | 505 | extern void lcd_puts_style_xyoffset(int x, int y, const unsigned char *str, |
508 | int style, int x_offset, int y_offset); | 506 | int style, int x_offset, int y_offset); |
509 | extern void lcd_puts_scroll_style_offset(int x, int y, const unsigned char *string, | ||
510 | int style, int x_offset); | ||
511 | extern void lcd_puts_scroll_style_xyoffset(int x, int y, const unsigned char *string, | 507 | extern void lcd_puts_scroll_style_xyoffset(int x, int y, const unsigned char *string, |
512 | int style, int x_offset, int y_offset); | 508 | int style, int x_offset, int y_offset); |
513 | 509 | ||