len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

lcd-common/scroll_engine: Remove unused functions lcd_puts_scroll_offset() and lcd_puts_scroll_style_offset().

Browse source 
Change-Id: Ia84ae88020d06a1cb634942ab5e635fd5d10ac66
This commit is contained in:
Thomas Martitz 2013-04-11 12:07:06 +02:00
parent 2ef9aa51f3
commit a422604435
6 changed files with 3 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/screen_access.c
View file

@ -251,7 +251,6 @@ struct screen screens[NB_SCREENS] =
.puts_style_offset=&lcd_puts_style_offset, .puts_style_offset=&lcd_puts_style_offset,
.puts_style_xyoffset=&lcd_puts_style_xyoffset, .puts_style_xyoffset=&lcd_puts_style_xyoffset,
.puts_scroll_style=&lcd_puts_scroll_style, .puts_scroll_style=&lcd_puts_scroll_style,
.puts_scroll_style_offset=&lcd_puts_scroll_style_offset,
.puts_scroll_style_xyoffset=&lcd_puts_scroll_style_xyoffset, .puts_scroll_style_xyoffset=&lcd_puts_scroll_style_xyoffset,
#endif /* HAVE_LCD_BITMAP */ #endif /* HAVE_LCD_BITMAP */
@ -269,7 +268,6 @@ struct screen screens[NB_SCREENS] =
.putsf=&lcd_putsf, .putsf=&lcd_putsf,
.puts_offset=&lcd_puts_offset, .puts_offset=&lcd_puts_offset,
.puts_scroll=&lcd_puts_scroll, .puts_scroll=&lcd_puts_scroll,
.puts_scroll_offset=&lcd_puts_scroll_offset,
.putsxy_scroll_func=&lcd_putsxy_scroll_func, .putsxy_scroll_func=&lcd_putsxy_scroll_func,
.scroll_speed=&lcd_scroll_speed, .scroll_speed=&lcd_scroll_speed,
.scroll_delay=&lcd_scroll_delay, .scroll_delay=&lcd_scroll_delay,
@ -357,7 +355,6 @@ struct screen screens[NB_SCREENS] =
.puts_style_offset=&lcd_remote_puts_style_offset, .puts_style_offset=&lcd_remote_puts_style_offset,
.puts_style_xyoffset=&lcd_remote_puts_style_xyoffset, .puts_style_xyoffset=&lcd_remote_puts_style_xyoffset,
.puts_scroll_style=&lcd_remote_puts_scroll_style, .puts_scroll_style=&lcd_remote_puts_scroll_style,
.puts_scroll_style_offset=&lcd_remote_puts_scroll_style_offset,
.puts_scroll_style_xyoffset=&lcd_remote_puts_scroll_style_xyoffset, .puts_scroll_style_xyoffset=&lcd_remote_puts_scroll_style_xyoffset,
#endif /* 1 */ #endif /* 1 */
@ -373,7 +370,6 @@ struct screen screens[NB_SCREENS] =
.putsf=&lcd_remote_putsf, .putsf=&lcd_remote_putsf,
.puts_offset=&lcd_remote_puts_offset, .puts_offset=&lcd_remote_puts_offset,
.puts_scroll=&lcd_remote_puts_scroll, .puts_scroll=&lcd_remote_puts_scroll,
.puts_scroll_offset=&lcd_remote_puts_scroll_offset,
.putsxy_scroll_func=&lcd_remote_putsxy_scroll_func, .putsxy_scroll_func=&lcd_remote_putsxy_scroll_func,
.scroll_speed=&lcd_remote_scroll_speed, .scroll_speed=&lcd_remote_scroll_speed,
.scroll_delay=&lcd_remote_scroll_delay, .scroll_delay=&lcd_remote_scroll_delay,

4
apps/screen_access.h
View file

@ -84,8 +84,6 @@ struct screen
int style, int x_offset, int y_offset); int style, int x_offset, int y_offset);
void (*puts_scroll_style)(int x, int y, const unsigned char *string, void (*puts_scroll_style)(int x, int y, const unsigned char *string,
int style); int style);
void (*puts_scroll_style_offset)(int x, int y, const unsigned char *string,
int style, int x_offset);
void (*puts_scroll_style_xyoffset)(int x, int y, const unsigned char *string, void (*puts_scroll_style_xyoffset)(int x, int y, const unsigned char *string,
int style, int x_offset, int y_offset); int style, int x_offset, int y_offset);
void (*mono_bitmap)(const unsigned char *src, void (*mono_bitmap)(const unsigned char *src,
@ -143,8 +141,6 @@ struct screen
void (*putsf)(int x, int y, const unsigned char *str, ...); void (*putsf)(int x, int y, const unsigned char *str, ...);
void (*puts_offset)(int x, int y, const unsigned char *str, int offset); void (*puts_offset)(int x, int y, const unsigned char *str, int offset);
void (*puts_scroll)(int x, int y, const unsigned char *string); void (*puts_scroll)(int x, int y, const unsigned char *string);
void (*puts_scroll_offset)(int x, int y, const unsigned char *string,
int x_offset);
void (*putsxy_scroll_func)(int x, int y, const unsigned char *string, void (*putsxy_scroll_func)(int x, int y, const unsigned char *string,
void (*scroll_func)(struct scrollinfo *), void (*scroll_func)(struct scrollinfo *),
void *data, int x_offset); void *data, int x_offset);

14
firmware/drivers/lcd-bitmap-common.c
View file

@ -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, void LCDFN(puts_scroll_style)(int x, int y, const unsigned char *string,
int style) int style)
{ {
LCDFN(puts_scroll_style_offset)(x, y, string, style, 0); LCDFN(puts_scroll_style_xyoffset)(x, y, string, style, 0, 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);
} }
#if !defined(HAVE_LCD_COLOR) || !defined(MAIN_LCD) #if !defined(HAVE_LCD_COLOR) || !defined(MAIN_LCD)

9
firmware/drivers/lcd-charcell.c
View file

@ -509,10 +509,6 @@ void lcd_puts_offset(int x, int y, const unsigned char *str, int offset)
} }
/** scrolling **/ /** 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, void lcd_puts_scroll_worker(int x, int y, const unsigned char *string,
int offset, 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, void lcd_puts_scroll(int x, int y, const unsigned char *string)
int offset)
{ {
lcd_puts_scroll_worker(x, y, string, offset, lcd_scroll_fn, NULL); lcd_puts_scroll_worker(x, y, string, 0, lcd_scroll_fn, NULL);
} }

5
firmware/export/lcd-remote.h
View file

@ -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(int x, int y, const unsigned char *str);
extern void lcd_remote_puts_scroll_style(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); 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, extern void lcd_remote_puts_scroll_style_xyoffset(int x, int y,
const unsigned char *string, const unsigned char *string,
int style, int x_offset, int style, int x_offset,

4
firmware/export/lcd.h
View file

@ -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_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_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_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_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(int x, int y, const unsigned char* string);
extern void lcd_puts_scroll_style(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); int style, int x_offset);
extern void lcd_puts_style_xyoffset(int x, int y, const unsigned char *str, extern void lcd_puts_style_xyoffset(int x, int y, const unsigned char *str,
int style, int x_offset, int y_offset); 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, extern void lcd_puts_scroll_style_xyoffset(int x, int y, const unsigned char *string,
int style, int x_offset, int y_offset); int style, int x_offset, int y_offset);