diff options
-rw-r--r-- | apps/screen_access.c | 4 | ||||
-rw-r--r-- | apps/screen_access.h | 4 | ||||
-rw-r--r-- | firmware/drivers/lcd-bitmap-common.c | 11 | ||||
-rw-r--r-- | firmware/export/lcd-remote.h | 6 | ||||
-rw-r--r-- | firmware/export/lcd.h | 5 |
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] = | |||
248 | .vline=&lcd_vline, | 248 | .vline=&lcd_vline, |
249 | .hline=&lcd_hline, | 249 | .hline=&lcd_hline, |
250 | .scroll_step=&lcd_scroll_step, | 250 | .scroll_step=&lcd_scroll_step, |
251 | .puts_style_xyoffset=&lcd_puts_style_xyoffset, | ||
252 | .puts_scroll_style_xyoffset=&lcd_puts_scroll_style_xyoffset, | ||
253 | #endif /* HAVE_LCD_BITMAP */ | 251 | #endif /* HAVE_LCD_BITMAP */ |
254 | 252 | ||
255 | #ifdef HAVE_LCD_CHARCELLS | 253 | #ifdef HAVE_LCD_CHARCELLS |
@@ -349,8 +347,6 @@ struct screen screens[NB_SCREENS] = | |||
349 | .vline=&lcd_remote_vline, | 347 | .vline=&lcd_remote_vline, |
350 | .hline=&lcd_remote_hline, | 348 | .hline=&lcd_remote_hline, |
351 | .scroll_step=&lcd_remote_scroll_step, | 349 | .scroll_step=&lcd_remote_scroll_step, |
352 | .puts_style_xyoffset=&lcd_remote_puts_style_xyoffset, | ||
353 | .puts_scroll_style_xyoffset=&lcd_remote_puts_scroll_style_xyoffset, | ||
354 | #endif /* 1 */ | 350 | #endif /* 1 */ |
355 | 351 | ||
356 | #if 0 /* no charcell remote LCDs so far */ | 352 | #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 | |||
78 | void (*setuifont)(int newfont); | 78 | void (*setuifont)(int newfont); |
79 | 79 | ||
80 | void (*scroll_step)(int pixels); | 80 | void (*scroll_step)(int pixels); |
81 | void (*puts_style_xyoffset)(int x, int y, const unsigned char *str, | ||
82 | int style, int x_offset, int y_offset); | ||
83 | void (*puts_scroll_style_xyoffset)(int x, int y, const unsigned char *string, | ||
84 | int style, int x_offset, int y_offset); | ||
85 | void (*mono_bitmap)(const unsigned char *src, | 81 | void (*mono_bitmap)(const unsigned char *src, |
86 | int x, int y, int width, int height); | 82 | int x, int y, int width, int height); |
87 | void (*mono_bitmap_part)(const unsigned char *src, int src_x, int src_y, | 83 | 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, | |||
445 | 445 | ||
446 | /*** Line oriented text output ***/ | 446 | /*** Line oriented text output ***/ |
447 | 447 | ||
448 | void LCDFN(puts_style_xyoffset)(int x, int y, const unsigned char *str, | 448 | static 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 | ||
470 | void LCDFN(puts)(int x, int y, const unsigned char *str) | 470 | void 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 | ||
585 | void 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 | |||
592 | void LCDFN(putsxy_scroll_func)(int x, int y, const unsigned char *string, | 585 | void 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); | |||
175 | extern void lcd_remote_clear_viewport(void); | 175 | extern void lcd_remote_clear_viewport(void); |
176 | extern void lcd_remote_puts(int x, int y, const unsigned char *str); | 176 | extern void lcd_remote_puts(int x, int y, const unsigned char *str); |
177 | extern void lcd_remote_putsf(int x, int y, const unsigned char *fmt, ...); | 177 | extern void lcd_remote_putsf(int x, int y, const unsigned char *fmt, ...); |
178 | extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *str, | ||
179 | int style, int x_offset, int y_offset); | ||
180 | extern void lcd_remote_putc(int x, int y, unsigned short ch); | 178 | extern void lcd_remote_putc(int x, int y, unsigned short ch); |
181 | extern void lcd_remote_puts_scroll(int x, int y, const unsigned char *str); | 179 | extern void lcd_remote_puts_scroll(int x, int y, const unsigned char *str); |
182 | extern 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); | ||
186 | extern void lcd_remote_putsxy_scroll_func(int x, int y, const unsigned char *string, | 180 | extern 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); | |||
496 | extern void lcd_setfont(int font); | 496 | extern void lcd_setfont(int font); |
497 | extern int lcd_getfont(void); | 497 | extern int lcd_getfont(void); |
498 | 498 | ||
499 | extern void lcd_puts_style_xyoffset(int x, int y, const unsigned char *str, | ||
500 | int style, int x_offset, int y_offset); | ||
501 | extern 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 |
506 | extern lcd_fastpixelfunc_type* const *lcd_fastpixelfuncs; | 501 | extern lcd_fastpixelfunc_type* const *lcd_fastpixelfuncs; |