devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

lcd-common/scroll_engine: Remove unused functions lcd_puts_style_xyoffset() and lcd_puts_scroll_style_xyoffset().

Browse source 
With this functions removed there is no exported function in firmware left
that draws line decorations. Also no function supports specifying an y-offset
anymore (was used for pixel accurate positioning of otherwise strictly line-based
API calls).

Both should be handled in apps/ now.

Change-Id: Iba4b28ccc6e686c7db63e34b51ad4badae983fce
This commit is contained in:
Thomas Martitz 2013-04-14 18:15:09 +02:00
parent 775ebe4ff6
commit 9a4686b563
5 changed files with 2 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/screen_access.c
View file

@ -248,8 +248,6 @@ struct screen screens[NB_SCREENS] =
.vline=&lcd_vline, .vline=&lcd_vline,
.hline=&lcd_hline, .hline=&lcd_hline,
.scroll_step=&lcd_scroll_step, .scroll_step=&lcd_scroll_step,
.puts_style_xyoffset=&lcd_puts_style_xyoffset,
.puts_scroll_style_xyoffset=&lcd_puts_scroll_style_xyoffset,
#endif /* HAVE_LCD_BITMAP */ #endif /* HAVE_LCD_BITMAP */
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS
@ -349,8 +347,6 @@ struct screen screens[NB_SCREENS] =
.vline=&lcd_remote_vline, .vline=&lcd_remote_vline,
.hline=&lcd_remote_hline, .hline=&lcd_remote_hline,
.scroll_step=&lcd_remote_scroll_step, .scroll_step=&lcd_remote_scroll_step,
.puts_style_xyoffset=&lcd_remote_puts_style_xyoffset,
.puts_scroll_style_xyoffset=&lcd_remote_puts_scroll_style_xyoffset,
#endif /* 1 */ #endif /* 1 */
#if 0 /* no charcell remote LCDs so far */ #if 0 /* no charcell remote LCDs so far */

4
apps/screen_access.h
View file

@ -78,10 +78,6 @@ struct screen
void (*setuifont)(int newfont); void (*setuifont)(int newfont);
void (*scroll_step)(int pixels); 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_xyoffset)(int x, int y, const unsigned char *string,
int style, int x_offset, int y_offset);
void (*mono_bitmap)(const unsigned char *src, void (*mono_bitmap)(const unsigned char *src,
int x, int y, int width, int height); int x, int y, int width, int height);
void (*mono_bitmap_part)(const unsigned char *src, int src_x, int src_y, void (*mono_bitmap_part)(const unsigned char *src, int src_x, int src_y,

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

@ -445,7 +445,7 @@ static void LCDFN(putsxyofs_style)(int xpos, int ypos,
/*** Line oriented text output ***/ /*** Line oriented text output ***/
void LCDFN(puts_style_xyoffset)(int x, int y, const unsigned char *str, static void LCDFN(putsofs_style)(int x, int y, const unsigned char *str,
int style, int x_offset, int y_offset) int style, int x_offset, int y_offset)
{ {
int xpos, ypos, h; int xpos, ypos, h;
@ -469,7 +469,7 @@ void LCDFN(puts_style_xyoffset)(int x, int y, const unsigned char *str,
void LCDFN(puts)(int x, int y, const unsigned char *str) void LCDFN(puts)(int x, int y, const unsigned char *str)
{ {
LCDFN(puts_style_xyoffset)(x, y, str, STYLE_DEFAULT, 0, 0); LCDFN(putsofs_style)(x, y, str, STYLE_DEFAULT, 0, 0);
} }
/* Formatting version of LCDFN(puts) */ /* Formatting version of LCDFN(puts) */
@ -582,13 +582,6 @@ static void LCDFN(puts_scroll_worker)(int x, int y, const unsigned char *string,
} }
} }
void LCDFN(puts_scroll_style_xyoffset)(int x, int y, const unsigned char *string,
int style, int x_offset, int y_offset)
{
LCDFN(puts_scroll_worker)(x, y, string, style, x_offset, y_offset,
true, LCDFN(scroll_fn), NULL);
}
void LCDFN(putsxy_scroll_func)(int x, int y, const unsigned char *string, void LCDFN(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)

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

@ -175,14 +175,8 @@ extern void lcd_remote_clear_display(void);
extern void lcd_remote_clear_viewport(void); extern void lcd_remote_clear_viewport(void);
extern void lcd_remote_puts(int x, int y, const unsigned char *str); 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_putsf(int x, int y, const unsigned char *fmt, ...);
extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *str,
int style, int x_offset, int y_offset);
extern void lcd_remote_putc(int x, int y, unsigned short ch); 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_xyoffset(int x, int y,
const unsigned char *string,
int style, int x_offset,
int y_offset);
extern void lcd_remote_putsxy_scroll_func(int x, int y, const unsigned char *string, extern void lcd_remote_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);

5
firmware/export/lcd.h
View file

@ -496,11 +496,6 @@ extern int lcd_get_drawmode(void);
extern void lcd_setfont(int font); extern void lcd_setfont(int font);
extern int lcd_getfont(void); extern int lcd_getfont(void);
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_xyoffset(int x, int y, const unsigned char *string,
int style, int x_offset, int y_offset);
/* low level drawing function pointer arrays */ /* low level drawing function pointer arrays */
#if LCD_DEPTH >= 8 #if LCD_DEPTH >= 8
extern lcd_fastpixelfunc_type* const *lcd_fastpixelfuncs; extern lcd_fastpixelfunc_type* const *lcd_fastpixelfuncs;