Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lcd-common: Remove unused function lcd_puts_offset().

Browse source 
Change-Id: I39749bf3db915e5a8ddb6e6f25eb201ea0aaf981
This commit is contained in:
Thomas Martitz 2013-04-13 18:17:16 +02:00
parent a422604435
commit 8f64625888
6 changed files with 17 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/screen_access.c
View file

@ -266,7 +266,6 @@ struct screen screens[NB_SCREENS] =
.putsxy=&lcd_putsxy,
.puts=&lcd_puts,
.putsf=&lcd_putsf,
.puts_offset=&lcd_puts_offset,
.puts_scroll=&lcd_puts_scroll,
.putsxy_scroll_func=&lcd_putsxy_scroll_func,
.scroll_speed=&lcd_scroll_speed,
@ -368,7 +367,6 @@ struct screen screens[NB_SCREENS] =
.putsxy=&lcd_remote_putsxy,
.puts=&lcd_remote_puts,
.putsf=&lcd_remote_putsf,
.puts_offset=&lcd_remote_puts_offset,
.puts_scroll=&lcd_remote_puts_scroll,
.putsxy_scroll_func=&lcd_remote_putsxy_scroll_func,
.scroll_speed=&lcd_remote_scroll_speed,

1
apps/screen_access.h
View file

@ -139,7 +139,6 @@ struct screen
void (*putsxy)(int x, int y, const unsigned char *str);
void (*puts)(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_scroll)(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 *),

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

@ -494,11 +494,6 @@ void LCDFN(puts_style)(int x, int y, const unsigned char *str, int style)
LCDFN(puts_style_offset)(x, y, str, style, 0);
}
void LCDFN(puts_offset)(int x, int y, const unsigned char *str, int offset)
{
LCDFN(puts_style_offset)(x, y, str, STYLE_DEFAULT, offset);
}
/*** scrolling ***/
static struct scrollinfo* find_scrolling_line(int x, int y)

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

@ -477,10 +477,25 @@ void lcd_putsxyf(int x, int y, const unsigned char *fmt, ...)
/*** Line oriented text output ***/
/* Put a string at a given char position, skipping first offset chars */
void lcd_putsofs(int x, int y, const unsigned char *str, int offset)
{
if ((unsigned)y >= (unsigned)current_vp->height)
return;
/* make sure scrolling is turned off on the line we are updating */
lcd_scroll_stop_viewport_rect(current_vp, x, y, current_vp->width - x, 1);
x = lcd_putsxyofs(x, y, offset, str);
while (x < current_vp->width)
lcd_putxchar(x++, y, xspace);
}
/* Put a string at a given char position */
void lcd_puts(int x, int y, const unsigned char *str)
{
lcd_puts_offset(x, y, str, 0);
lcd_putsofs(x, y, str, 0);
}
/* Formatting version of lcd_puts */
@ -494,20 +509,6 @@ void lcd_putsf(int x, int y, const unsigned char *fmt, ...)
lcd_puts(x, y, buf);
}
/* Put a string at a given char position, skipping first offset chars */
void lcd_puts_offset(int x, int y, const unsigned char *str, int offset)
{
if ((unsigned)y >= (unsigned)current_vp->height)
return;
/* make sure scrolling is turned off on the line we are updating */
lcd_scroll_stop_viewport_rect(current_vp, x, y, current_vp->width - x, 1);
x = lcd_putsxyofs(x, y, offset, str);
while (x < current_vp->width)
lcd_putxchar(x++, y, xspace);
}
/** scrolling **/
void lcd_puts_scroll_worker(int x, int y, const unsigned char *string,
@ -529,7 +530,7 @@ void lcd_puts_scroll_worker(int x, int y, const unsigned char *string,
s->start_tick = current_tick + lcd_scroll_info.delay;
lcd_puts_offset(x, y, string, offset);
lcd_putsofs(x, y, string, offset);
len = utf8length(string);
if (current_vp->width - x >= len)

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

@ -177,8 +177,6 @@ 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_offset(int x, int y, const unsigned char *str,
int offset);
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,

1
firmware/export/lcd.h
View file

@ -207,7 +207,6 @@ extern void lcd_putsxy_style_offset(int x, int y, const unsigned char *str,
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_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,