summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/lcd-bitmap-common.c11
-rw-r--r--firmware/export/lcd-remote.h6
-rw-r--r--firmware/export/lcd.h5
3 files changed, 2 insertions, 20 deletions
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,
445 445
446/*** Line oriented text output ***/ 446/*** Line oriented text output ***/
447 447
448void LCDFN(puts_style_xyoffset)(int x, int y, const unsigned char *str, 448static void LCDFN(putsofs_style)(int x, int y, const unsigned char *str,
449 int style, int x_offset, int y_offset) 449 int style, int x_offset, int y_offset)
450{ 450{
451 int xpos, ypos, h; 451 int xpos, ypos, h;
@@ -469,7 +469,7 @@ void LCDFN(puts_style_xyoffset)(int x, int y, const unsigned char *str,
469 469
470void LCDFN(puts)(int x, int y, const unsigned char *str) 470void LCDFN(puts)(int x, int y, const unsigned char *str)
471{ 471{
472 LCDFN(puts_style_xyoffset)(x, y, str, STYLE_DEFAULT, 0, 0); 472 LCDFN(putsofs_style)(x, y, str, STYLE_DEFAULT, 0, 0);
473} 473}
474 474
475/* Formatting version of LCDFN(puts) */ 475/* Formatting version of LCDFN(puts) */
@@ -582,13 +582,6 @@ static void LCDFN(puts_scroll_worker)(int x, int y, const unsigned char *string,
582 } 582 }
583} 583}
584 584
585void LCDFN(puts_scroll_style_xyoffset)(int x, int y, const unsigned char *string,
586 int style, int x_offset, int y_offset)
587{
588 LCDFN(puts_scroll_worker)(x, y, string, style, x_offset, y_offset,
589 true, LCDFN(scroll_fn), NULL);
590}
591
592void LCDFN(putsxy_scroll_func)(int x, int y, const unsigned char *string, 585void LCDFN(putsxy_scroll_func)(int x, int y, const unsigned char *string,
593 void (*scroll_func)(struct scrollinfo *), 586 void (*scroll_func)(struct scrollinfo *),
594 void *data, int x_offset) 587 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);
175extern void lcd_remote_clear_viewport(void); 175extern void lcd_remote_clear_viewport(void);
176extern void lcd_remote_puts(int x, int y, const unsigned char *str); 176extern void lcd_remote_puts(int x, int y, const unsigned char *str);
177extern void lcd_remote_putsf(int x, int y, const unsigned char *fmt, ...); 177extern void lcd_remote_putsf(int x, int y, const unsigned char *fmt, ...);
178extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *str,
179 int style, int x_offset, int y_offset);
180extern void lcd_remote_putc(int x, int y, unsigned short ch); 178extern void lcd_remote_putc(int x, int y, unsigned short ch);
181extern void lcd_remote_puts_scroll(int x, int y, const unsigned char *str); 179extern void lcd_remote_puts_scroll(int x, int y, const unsigned char *str);
182extern void lcd_remote_puts_scroll_style_xyoffset(int x, int y,
183 const unsigned char *string,
184 int style, int x_offset,
185 int y_offset);
186extern void lcd_remote_putsxy_scroll_func(int x, int y, const unsigned char *string, 180extern void lcd_remote_putsxy_scroll_func(int x, int y, const unsigned char *string,
187 void (*scroll_func)(struct scrollinfo *), 181 void (*scroll_func)(struct scrollinfo *),
188 void *data, int x_offset); 182 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);
496extern void lcd_setfont(int font); 496extern void lcd_setfont(int font);
497extern int lcd_getfont(void); 497extern int lcd_getfont(void);
498 498
499extern void lcd_puts_style_xyoffset(int x, int y, const unsigned char *str,
500 int style, int x_offset, int y_offset);
501extern void lcd_puts_scroll_style_xyoffset(int x, int y, const unsigned char *string,
502 int style, int x_offset, int y_offset);
503
504/* low level drawing function pointer arrays */ 499/* low level drawing function pointer arrays */
505#if LCD_DEPTH >= 8 500#if LCD_DEPTH >= 8
506extern lcd_fastpixelfunc_type* const *lcd_fastpixelfuncs; 501extern lcd_fastpixelfunc_type* const *lcd_fastpixelfuncs;