diff options
-rw-r--r-- | apps/plugin.c | 2 | ||||
-rw-r--r-- | apps/plugin.h | 2 | ||||
-rw-r--r-- | docs/PLUGIN_API | 14 | ||||
-rw-r--r-- | firmware/drivers/lcd-bitmap-common.c | 5 | ||||
-rw-r--r-- | firmware/export/lcd-remote.h | 2 | ||||
-rw-r--r-- | firmware/export/lcd.h | 1 |
6 files changed, 2 insertions, 24 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index d80e6a1e0e..eed3be7291 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -200,7 +200,6 @@ static const struct plugin_api rockbox_api = { | |||
200 | lcd_blit_pal256, | 200 | lcd_blit_pal256, |
201 | lcd_pal256_update_pal, | 201 | lcd_pal256_update_pal, |
202 | #endif | 202 | #endif |
203 | lcd_puts_style, | ||
204 | lcd_puts_scroll_style, | 203 | lcd_puts_scroll_style, |
205 | #ifdef HAVE_LCD_INVERT | 204 | #ifdef HAVE_LCD_INVERT |
206 | lcd_set_invert_display, | 205 | lcd_set_invert_display, |
@@ -260,7 +259,6 @@ static const struct plugin_api rockbox_api = { | |||
260 | lcd_remote_mono_bitmap_part, | 259 | lcd_remote_mono_bitmap_part, |
261 | lcd_remote_mono_bitmap, | 260 | lcd_remote_mono_bitmap, |
262 | lcd_remote_putsxy, | 261 | lcd_remote_putsxy, |
263 | lcd_remote_puts_style, | ||
264 | lcd_remote_puts_scroll_style, | 262 | lcd_remote_puts_scroll_style, |
265 | &lcd_remote_static_framebuffer[0][0], | 263 | &lcd_remote_static_framebuffer[0][0], |
266 | lcd_remote_update, | 264 | lcd_remote_update, |
diff --git a/apps/plugin.h b/apps/plugin.h index 4e6f4a8c4e..237d2f82ee 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -269,7 +269,6 @@ struct plugin_api { | |||
269 | int width, int height); | 269 | int width, int height); |
270 | void (*lcd_pal256_update_pal)(fb_data *palette); | 270 | void (*lcd_pal256_update_pal)(fb_data *palette); |
271 | #endif | 271 | #endif |
272 | void (*lcd_puts_style)(int x, int y, const unsigned char *str, int style); | ||
273 | void (*lcd_puts_scroll_style)(int x, int y, const unsigned char* string, | 272 | void (*lcd_puts_scroll_style)(int x, int y, const unsigned char* string, |
274 | int style); | 273 | int style); |
275 | #ifdef HAVE_LCD_INVERT | 274 | #ifdef HAVE_LCD_INVERT |
@@ -347,7 +346,6 @@ struct plugin_api { | |||
347 | void (*lcd_remote_mono_bitmap)(const unsigned char *src, int x, int y, | 346 | void (*lcd_remote_mono_bitmap)(const unsigned char *src, int x, int y, |
348 | int width, int height); | 347 | int width, int height); |
349 | void (*lcd_remote_putsxy)(int x, int y, const unsigned char *string); | 348 | void (*lcd_remote_putsxy)(int x, int y, const unsigned char *string); |
350 | void (*lcd_remote_puts_style)(int x, int y, const unsigned char *str, int style); | ||
351 | void (*lcd_remote_puts_scroll_style)(int x, int y, const unsigned char* string, | 349 | void (*lcd_remote_puts_scroll_style)(int x, int y, const unsigned char* string, |
352 | int style); | 350 | int style); |
353 | fb_remote_data* lcd_remote_framebuffer; | 351 | fb_remote_data* lcd_remote_framebuffer; |
diff --git a/docs/PLUGIN_API b/docs/PLUGIN_API index 75c82d447b..b895876bc0 100644 --- a/docs/PLUGIN_API +++ b/docs/PLUGIN_API | |||
@@ -1105,21 +1105,11 @@ void lcd_puts_scroll(int x, int y, const unsigned char* string) | |||
1105 | void lcd_puts_scroll_style(int x, int y, const unsigned char* string, int style) | 1105 | void lcd_puts_scroll_style(int x, int y, const unsigned char* string, int style) |
1106 | \group lcd | 1106 | \group lcd |
1107 | \conditions !defined(HAVE_LCD_CHARCELLS) | 1107 | \conditions !defined(HAVE_LCD_CHARCELLS) |
1108 | \param x | ||
1109 | \param y | ||
1110 | \param string | ||
1111 | \param style | ||
1112 | \description Same as lcd_puts_style, but with scrolling is enabled | ||
1113 | \see lcd_puts_style | ||
1114 | |||
1115 | void lcd_puts_style(int x, int y, const unsigned char *str, int style) | ||
1116 | \group lcd | ||
1117 | \conditions !defined(HAVE_LCD_CHARCELLS) | ||
1118 | \param x Row X | 1108 | \param x Row X |
1119 | \param y Column Y | 1109 | \param y Column Y |
1120 | \param str | 1110 | \param string |
1121 | \param style can be STYLE_DEFAULT for black text display or STYLE_INVERT for white text display | 1111 | \param style can be STYLE_DEFAULT for black text display or STYLE_INVERT for white text display |
1122 | \description Put a string at row =x= and column =y= | 1112 | \description Put a string at row =x= and column =y=, the text scrolls if necessary |
1123 | 1113 | ||
1124 | void lcd_put_cursor(int x, int y, unsigned long ucs) | 1114 | void lcd_put_cursor(int x, int y, unsigned long ucs) |
1125 | \group lcd | 1115 | \group lcd |
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index 2219b6de78..f9bc03d48e 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c | |||
@@ -489,11 +489,6 @@ void LCDFN(putsf)(int x, int y, const unsigned char *fmt, ...) | |||
489 | LCDFN(puts)(x, y, buf); | 489 | LCDFN(puts)(x, y, buf); |
490 | } | 490 | } |
491 | 491 | ||
492 | void LCDFN(puts_style)(int x, int y, const unsigned char *str, int style) | ||
493 | { | ||
494 | LCDFN(puts_style_offset)(x, y, str, style, 0); | ||
495 | } | ||
496 | |||
497 | /*** scrolling ***/ | 492 | /*** scrolling ***/ |
498 | 493 | ||
499 | static struct scrollinfo* find_scrolling_line(int x, int y) | 494 | static struct scrollinfo* find_scrolling_line(int x, int y) |
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h index 347a46e8bd..d803525318 100644 --- a/firmware/export/lcd-remote.h +++ b/firmware/export/lcd-remote.h | |||
@@ -175,8 +175,6 @@ 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(int x, int y, const unsigned char *str, | ||
179 | int style); | ||
180 | extern void lcd_remote_puts_style_offset(int x, int y, const unsigned char *str, | 178 | extern void lcd_remote_puts_style_offset(int x, int y, const unsigned char *str, |
181 | int style, int offset); | 179 | int style, int offset); |
182 | extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *str, | 180 | extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *str, |
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 7c361d4097..0c5cf74ac7 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -206,7 +206,6 @@ extern void lcd_putsxy_style_offset(int x, int y, const unsigned char *str, | |||
206 | int style, int offset); | 206 | int style, int offset); |
207 | extern void lcd_puts(int x, int y, const unsigned char *string); | 207 | extern void lcd_puts(int x, int y, const unsigned char *string); |
208 | extern void lcd_putsf(int x, int y, const unsigned char *fmt, ...); | 208 | extern void lcd_putsf(int x, int y, const unsigned char *fmt, ...); |
209 | extern void lcd_puts_style(int x, int y, const unsigned char *string, int style); | ||
210 | extern void lcd_putc(int x, int y, unsigned long ucs); | 209 | extern void lcd_putc(int x, int y, unsigned long ucs); |
211 | extern void lcd_puts_scroll(int x, int y, const unsigned char* string); | 210 | extern void lcd_puts_scroll(int x, int y, const unsigned char* string); |
212 | extern void lcd_puts_scroll_style(int x, int y, const unsigned char* string, | 211 | extern void lcd_puts_scroll_style(int x, int y, const unsigned char* string, |