summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/screen_access.c2
-rw-r--r--apps/screen_access.h2
-rw-r--r--firmware/drivers/lcd-bitmap-common.c8
-rw-r--r--firmware/export/lcd-remote.h2
-rw-r--r--firmware/export/lcd.h2
5 files changed, 1 insertions, 15 deletions
diff --git a/apps/screen_access.c b/apps/screen_access.c
index c8f47ed0f6..452e5e9501 100644
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@@ -248,7 +248,6 @@ struct screen screens[NB_SCREENS] =
.vline=&lcd_vline,
.hline=&lcd_hline,
.scroll_step=&lcd_scroll_step,
- .puts_style_offset=&lcd_puts_style_offset,
.puts_style_xyoffset=&lcd_puts_style_xyoffset,
.puts_scroll_style=&lcd_puts_scroll_style,
.puts_scroll_style_xyoffset=&lcd_puts_scroll_style_xyoffset,
@@ -351,7 +350,6 @@ struct screen screens[NB_SCREENS] =
.vline=&lcd_remote_vline,
.hline=&lcd_remote_hline,
.scroll_step=&lcd_remote_scroll_step,
- .puts_style_offset=&lcd_remote_puts_style_offset,
.puts_style_xyoffset=&lcd_remote_puts_style_xyoffset,
.puts_scroll_style=&lcd_remote_puts_scroll_style,
.puts_scroll_style_xyoffset=&lcd_remote_puts_scroll_style_xyoffset,
diff --git a/apps/screen_access.h b/apps/screen_access.h
index 1d120f7bb0..4f1faac187 100644
--- a/apps/screen_access.h
+++ b/apps/screen_access.h
@@ -78,8 +78,6 @@ struct screen
void (*setuifont)(int newfont);
void (*scroll_step)(int pixels);
- void (*puts_style_offset)(int x, int y, const unsigned char *str,
- int style, int x_offset);
void (*puts_style_xyoffset)(int x, int y, const unsigned char *str,
int style, int x_offset, int y_offset);
void (*puts_scroll_style)(int x, int y, const unsigned char *string,
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index f9bc03d48e..a95efbc1d8 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -467,15 +467,9 @@ void LCDFN(puts_style_xyoffset)(int x, int y, const unsigned char *str,
LCDFN(putsxyofs_style)(xpos, ypos+y_offset, str, style, h, x_offset);
}
-void LCDFN(puts_style_offset)(int x, int y, const unsigned char *str,
- int style, int x_offset)
-{
- LCDFN(puts_style_xyoffset)(x, y, str, style, x_offset, 0);
-}
-
void LCDFN(puts)(int x, int y, const unsigned char *str)
{
- LCDFN(puts_style_offset)(x, y, str, STYLE_DEFAULT, 0);
+ LCDFN(puts_style_xyoffset)(x, y, str, STYLE_DEFAULT, 0, 0);
}
/* Formatting version of LCDFN(puts) */
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index d803525318..53ddf0fcea 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -175,8 +175,6 @@ 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_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,
int style, int x_offset, int y_offset);
extern void lcd_remote_putc(int x, int y, unsigned short ch);
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 0c5cf74ac7..b8c4f5ce1c 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -498,8 +498,6 @@ extern int lcd_get_drawmode(void);
extern void lcd_setfont(int font);
extern int lcd_getfont(void);
-extern void lcd_puts_style_offset(int x, int y, const unsigned char *str,
- int style, int x_offset);
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,