diff options
-rw-r--r-- | apps/plugin.c | 2 | ||||
-rw-r--r-- | apps/plugin.h | 4 | ||||
-rw-r--r-- | apps/screen_access.c | 2 | ||||
-rw-r--r-- | apps/screen_access.h | 2 | ||||
-rw-r--r-- | docs/PLUGIN_API | 18 | ||||
-rw-r--r-- | firmware/drivers/lcd-bitmap-common.c | 9 | ||||
-rw-r--r-- | firmware/export/lcd-remote.h | 2 | ||||
-rw-r--r-- | firmware/export/lcd.h | 2 |
8 files changed, 2 insertions, 39 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index eed3be7291..af06a4c484 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_scroll_style, | ||
204 | #ifdef HAVE_LCD_INVERT | 203 | #ifdef HAVE_LCD_INVERT |
205 | lcd_set_invert_display, | 204 | lcd_set_invert_display, |
206 | #endif /* HAVE_LCD_INVERT */ | 205 | #endif /* HAVE_LCD_INVERT */ |
@@ -259,7 +258,6 @@ static const struct plugin_api rockbox_api = { | |||
259 | lcd_remote_mono_bitmap_part, | 258 | lcd_remote_mono_bitmap_part, |
260 | lcd_remote_mono_bitmap, | 259 | lcd_remote_mono_bitmap, |
261 | lcd_remote_putsxy, | 260 | lcd_remote_putsxy, |
262 | lcd_remote_puts_scroll_style, | ||
263 | &lcd_remote_static_framebuffer[0][0], | 261 | &lcd_remote_static_framebuffer[0][0], |
264 | lcd_remote_update, | 262 | lcd_remote_update, |
265 | lcd_remote_update_rect, | 263 | lcd_remote_update_rect, |
diff --git a/apps/plugin.h b/apps/plugin.h index 237d2f82ee..673ad0b8c1 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -269,8 +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_scroll_style)(int x, int y, const unsigned char* string, | ||
273 | int style); | ||
274 | #ifdef HAVE_LCD_INVERT | 272 | #ifdef HAVE_LCD_INVERT |
275 | void (*lcd_set_invert_display)(bool yesno); | 273 | void (*lcd_set_invert_display)(bool yesno); |
276 | #endif /* HAVE_LCD_INVERT */ | 274 | #endif /* HAVE_LCD_INVERT */ |
@@ -346,8 +344,6 @@ struct plugin_api { | |||
346 | void (*lcd_remote_mono_bitmap)(const unsigned char *src, int x, int y, | 344 | void (*lcd_remote_mono_bitmap)(const unsigned char *src, int x, int y, |
347 | int width, int height); | 345 | int width, int height); |
348 | void (*lcd_remote_putsxy)(int x, int y, const unsigned char *string); | 346 | void (*lcd_remote_putsxy)(int x, int y, const unsigned char *string); |
349 | void (*lcd_remote_puts_scroll_style)(int x, int y, const unsigned char* string, | ||
350 | int style); | ||
351 | fb_remote_data* lcd_remote_framebuffer; | 347 | fb_remote_data* lcd_remote_framebuffer; |
352 | void (*lcd_remote_update)(void); | 348 | void (*lcd_remote_update)(void); |
353 | void (*lcd_remote_update_rect)(int x, int y, int width, int height); | 349 | void (*lcd_remote_update_rect)(int x, int y, int width, int height); |
diff --git a/apps/screen_access.c b/apps/screen_access.c index 452e5e9501..7ca6f8d310 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c | |||
@@ -249,7 +249,6 @@ struct screen screens[NB_SCREENS] = | |||
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, | 251 | .puts_style_xyoffset=&lcd_puts_style_xyoffset, |
252 | .puts_scroll_style=&lcd_puts_scroll_style, | ||
253 | .puts_scroll_style_xyoffset=&lcd_puts_scroll_style_xyoffset, | 252 | .puts_scroll_style_xyoffset=&lcd_puts_scroll_style_xyoffset, |
254 | #endif /* HAVE_LCD_BITMAP */ | 253 | #endif /* HAVE_LCD_BITMAP */ |
255 | 254 | ||
@@ -351,7 +350,6 @@ struct screen screens[NB_SCREENS] = | |||
351 | .hline=&lcd_remote_hline, | 350 | .hline=&lcd_remote_hline, |
352 | .scroll_step=&lcd_remote_scroll_step, | 351 | .scroll_step=&lcd_remote_scroll_step, |
353 | .puts_style_xyoffset=&lcd_remote_puts_style_xyoffset, | 352 | .puts_style_xyoffset=&lcd_remote_puts_style_xyoffset, |
354 | .puts_scroll_style=&lcd_remote_puts_scroll_style, | ||
355 | .puts_scroll_style_xyoffset=&lcd_remote_puts_scroll_style_xyoffset, | 353 | .puts_scroll_style_xyoffset=&lcd_remote_puts_scroll_style_xyoffset, |
356 | #endif /* 1 */ | 354 | #endif /* 1 */ |
357 | 355 | ||
diff --git a/apps/screen_access.h b/apps/screen_access.h index 4f1faac187..933a4dc692 100644 --- a/apps/screen_access.h +++ b/apps/screen_access.h | |||
@@ -80,8 +80,6 @@ struct screen | |||
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, | 81 | void (*puts_style_xyoffset)(int x, int y, const unsigned char *str, |
82 | int style, int x_offset, int y_offset); | 82 | int style, int x_offset, int y_offset); |
83 | void (*puts_scroll_style)(int x, int y, const unsigned char *string, | ||
84 | int style); | ||
85 | void (*puts_scroll_style_xyoffset)(int x, int y, const unsigned char *string, | 83 | void (*puts_scroll_style_xyoffset)(int x, int y, const unsigned char *string, |
86 | int style, int x_offset, int y_offset); | 84 | int style, int x_offset, int y_offset); |
87 | void (*mono_bitmap)(const unsigned char *src, | 85 | void (*mono_bitmap)(const unsigned char *src, |
diff --git a/docs/PLUGIN_API b/docs/PLUGIN_API index b895876bc0..768342bd80 100644 --- a/docs/PLUGIN_API +++ b/docs/PLUGIN_API | |||
@@ -1102,15 +1102,6 @@ void lcd_puts_scroll(int x, int y, const unsigned char* string) | |||
1102 | \param string | 1102 | \param string |
1103 | \description Puts scrolling string on the LCD at row =x= and column =y=. The scrolling style is STYLE_DEFAULT. | 1103 | \description Puts scrolling string on the LCD at row =x= and column =y=. The scrolling style is STYLE_DEFAULT. |
1104 | 1104 | ||
1105 | void lcd_puts_scroll_style(int x, int y, const unsigned char* string, int style) | ||
1106 | \group lcd | ||
1107 | \conditions !defined(HAVE_LCD_CHARCELLS) | ||
1108 | \param x Row X | ||
1109 | \param y Column Y | ||
1110 | \param string | ||
1111 | \param style can be STYLE_DEFAULT for black text display or STYLE_INVERT for white text display | ||
1112 | \description Put a string at row =x= and column =y=, the text scrolls if necessary | ||
1113 | |||
1114 | void lcd_put_cursor(int x, int y, unsigned long ucs) | 1105 | void lcd_put_cursor(int x, int y, unsigned long ucs) |
1115 | \group lcd | 1106 | \group lcd |
1116 | \conditions (defined(HAVE_LCD_CHARCELLS)) | 1107 | \conditions (defined(HAVE_LCD_CHARCELLS)) |
@@ -1266,15 +1257,6 @@ void lcd_remote_puts_scroll(int x, int y, const unsigned char* string) | |||
1266 | \param string | 1257 | \param string |
1267 | \description | 1258 | \description |
1268 | 1259 | ||
1269 | void lcd_remote_puts_scroll_style(int x, int y, const unsigned char* string, int style) | ||
1270 | \group remote lcd | ||
1271 | \conditions (defined(HAVE_REMOTE_LCD)) | ||
1272 | \param x | ||
1273 | \param y | ||
1274 | \param string | ||
1275 | \param style | ||
1276 | \description | ||
1277 | |||
1278 | void lcd_remote_puts_style(int x, int y, const unsigned char *str, int style) | 1260 | void lcd_remote_puts_style(int x, int y, const unsigned char *str, int style) |
1279 | \group remote lcd | 1261 | \group remote lcd |
1280 | \conditions (defined(HAVE_REMOTE_LCD)) | 1262 | \conditions (defined(HAVE_REMOTE_LCD)) |
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index a95efbc1d8..14c63ec471 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c | |||
@@ -602,13 +602,8 @@ void LCDFN(putsxy_scroll_func)(int x, int y, const unsigned char *string, | |||
602 | 602 | ||
603 | void LCDFN(puts_scroll)(int x, int y, const unsigned char *string) | 603 | void LCDFN(puts_scroll)(int x, int y, const unsigned char *string) |
604 | { | 604 | { |
605 | LCDFN(puts_scroll_style)(x, y, string, STYLE_DEFAULT); | 605 | LCDFN(puts_scroll_worker)(x, y, string, STYLE_DEFAULT, 0, 0, |
606 | } | 606 | true, LCDFN(scroll_fn), NULL); |
607 | |||
608 | void LCDFN(puts_scroll_style)(int x, int y, const unsigned char *string, | ||
609 | int style) | ||
610 | { | ||
611 | LCDFN(puts_scroll_style_xyoffset)(x, y, string, style, 0, 0); | ||
612 | } | 607 | } |
613 | 608 | ||
614 | #if !defined(HAVE_LCD_COLOR) || !defined(MAIN_LCD) | 609 | #if !defined(HAVE_LCD_COLOR) || !defined(MAIN_LCD) |
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h index 53ddf0fcea..4c0a894072 100644 --- a/firmware/export/lcd-remote.h +++ b/firmware/export/lcd-remote.h | |||
@@ -179,8 +179,6 @@ extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *st | |||
179 | int style, int x_offset, int y_offset); | 179 | int style, int x_offset, int y_offset); |
180 | extern void lcd_remote_putc(int x, int y, unsigned short ch); | 180 | 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); | 181 | extern void lcd_remote_puts_scroll(int x, int y, const unsigned char *str); |
182 | extern void lcd_remote_puts_scroll_style(int x, int y, const unsigned char *str, | ||
183 | int style); | ||
184 | extern void lcd_remote_puts_scroll_style_xyoffset(int x, int y, | 182 | extern void lcd_remote_puts_scroll_style_xyoffset(int x, int y, |
185 | const unsigned char *string, | 183 | const unsigned char *string, |
186 | int style, int x_offset, | 184 | int style, int x_offset, |
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index b8c4f5ce1c..9e6470d526 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -208,8 +208,6 @@ 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_putc(int x, int y, unsigned long ucs); | 209 | extern void lcd_putc(int x, int y, unsigned long ucs); |
210 | 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); |
211 | extern void lcd_puts_scroll_style(int x, int y, const unsigned char* string, | ||
212 | int style); | ||
213 | extern void lcd_putsxy_scroll_func(int x, int y, const unsigned char *string, | 211 | extern void lcd_putsxy_scroll_func(int x, int y, const unsigned char *string, |
214 | void (*scroll_func)(struct scrollinfo *), | 212 | void (*scroll_func)(struct scrollinfo *), |
215 | void *data, int x_offset); | 213 | void *data, int x_offset); |