summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/screen_access.c4
-rw-r--r--apps/screen_access.h4
-rw-r--r--firmware/drivers/lcd-bitmap-common.c11
-rw-r--r--firmware/export/lcd-remote.h6
-rw-r--r--firmware/export/lcd.h5
5 files changed, 2 insertions, 28 deletions
diff --git a/apps/screen_access.c b/apps/screen_access.c
index 7ca6f8d310..31a946080c 100644
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@@ -248,8 +248,6 @@ struct screen screens[NB_SCREENS] =
.vline=&lcd_vline,
.hline=&lcd_hline,
.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 */
#ifdef HAVE_LCD_CHARCELLS
@@ -349,8 +347,6 @@ struct screen screens[NB_SCREENS] =
.vline=&lcd_remote_vline,
.hline=&lcd_remote_hline,
.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 */
#if 0 /* no charcell remote LCDs so far */
diff --git a/apps/screen_access.h b/apps/screen_access.h
index 933a4dc692..c5684fc0c7 100644
--- a/apps/screen_access.h
+++ b/apps/screen_access.h
@@ -78,10 +78,6 @@ struct screen
void (*setuifont)(int newfont);
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,
int x, int y, int width, int height);
void (*mono_bitmap_part)(const unsigned char *src, int src_x, int src_y,
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index 14c63ec471..330639fd87 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -445,7 +445,7 @@ static void LCDFN(putsxyofs_style)(int xpos, int ypos,
/*** 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 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)
{
- 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) */
@@ -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 (*scroll_func)(struct scrollinfo *),
void *data, int x_offset)
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index 4c0a894072..bc26a23cb7 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -175,14 +175,8 @@ extern void lcd_remote_clear_display(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_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_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,
void (*scroll_func)(struct scrollinfo *),
void *data, int x_offset);
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 9e6470d526..afdc5cf45e 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -496,11 +496,6 @@ extern int lcd_get_drawmode(void);
extern void lcd_setfont(int font);
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 */
#if LCD_DEPTH >= 8
extern lcd_fastpixelfunc_type* const *lcd_fastpixelfuncs;