diff options
author | Thomas Martitz <kugel@rockbox.org> | 2013-04-03 16:33:23 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2013-12-14 23:11:30 +0100 |
commit | 1c5d0b41eebdb4f8c627b1a0e5f7b699f0b08fb8 (patch) | |
tree | 3ec44a4e6cfe4bfaab689e765ef3546d8dac730d /firmware/export | |
parent | 47c8d3c14d8fdaf4749ef5e0380fb0c52140b5fb (diff) | |
download | rockbox-1c5d0b41eebdb4f8c627b1a0e5f7b699f0b08fb8.tar.gz rockbox-1c5d0b41eebdb4f8c627b1a0e5f7b699f0b08fb8.zip |
scroll_engine: Rename scroll_stop* functions to be more consistent with the lcd api.
Change-Id: I8ada10b96bfb628cca0331689e8b936ae47c7e1c
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/lcd-remote.h | 3 | ||||
-rw-r--r-- | firmware/export/lcd.h | 4 | ||||
-rw-r--r-- | firmware/export/scroll_engine.h | 24 |
3 files changed, 17 insertions, 14 deletions
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h index 6a3371fef2..74b668db3d 100644 --- a/firmware/export/lcd-remote.h +++ b/firmware/export/lcd-remote.h | |||
@@ -187,9 +187,6 @@ extern void lcd_remote_puts_style_offset(int x, int y, const unsigned char *str, | |||
187 | extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *str, | 187 | extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *str, |
188 | int style, int x_offset, int y_offset); | 188 | int style, int x_offset, int y_offset); |
189 | extern void lcd_remote_putc(int x, int y, unsigned short ch); | 189 | extern void lcd_remote_putc(int x, int y, unsigned short ch); |
190 | extern void lcd_remote_stop_scroll(void); | ||
191 | extern void lcd_remote_scroll_speed(int speed); | ||
192 | extern void lcd_remote_scroll_delay(int ms); | ||
193 | extern void lcd_remote_puts_scroll(int x, int y, const unsigned char *str); | 190 | extern void lcd_remote_puts_scroll(int x, int y, const unsigned char *str); |
194 | extern void lcd_remote_puts_scroll_style(int x, int y, const unsigned char *str, | 191 | extern void lcd_remote_puts_scroll_style(int x, int y, const unsigned char *str, |
195 | int style); | 192 | int style); |
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 5ad2d83513..7ea053f241 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -207,10 +207,6 @@ extern void lcd_puts_offset(int x, int y, const unsigned char *str, int offset); | |||
207 | extern void lcd_puts_scroll_offset(int x, int y, const unsigned char *string, | 207 | extern void lcd_puts_scroll_offset(int x, int y, const unsigned char *string, |
208 | int offset); | 208 | int offset); |
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_stop_scroll(void); | ||
211 | extern void lcd_bidir_scroll(int threshold); | ||
212 | extern void lcd_scroll_speed(int speed); | ||
213 | extern void lcd_scroll_delay(int ms); | ||
214 | 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); |
215 | 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, |
216 | int style); | 212 | int style); |
diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h index 55f4120893..01a9a5e33d 100644 --- a/firmware/export/scroll_engine.h +++ b/firmware/export/scroll_engine.h | |||
@@ -29,14 +29,24 @@ | |||
29 | #include <lcd.h> | 29 | #include <lcd.h> |
30 | #include "file.h" | 30 | #include "file.h" |
31 | 31 | ||
32 | void scroll_init(void) INIT_ATTR; | 32 | extern void scroll_init(void) INIT_ATTR; |
33 | void lcd_scroll_stop(const struct viewport* vp); | 33 | |
34 | void lcd_scroll_stop_line(const struct viewport* vp, int y); | 34 | extern void lcd_bidir_scroll(int threshold); |
35 | void lcd_scroll_fn(void); | 35 | extern void lcd_scroll_speed(int speed); |
36 | extern void lcd_scroll_delay(int ms); | ||
37 | |||
38 | extern void lcd_scroll_stop(void); | ||
39 | extern void lcd_scroll_stop_viewport(const struct viewport *vp); | ||
40 | extern void lcd_scroll_stop_viewport_line(const struct viewport *vp, int line); | ||
41 | extern void lcd_scroll_fn(void); | ||
36 | #ifdef HAVE_REMOTE_LCD | 42 | #ifdef HAVE_REMOTE_LCD |
37 | void lcd_remote_scroll_fn(void); | 43 | extern void lcd_remote_scroll_speed(int speed); |
38 | void lcd_remote_scroll_stop(const struct viewport* vp); | 44 | extern void lcd_remote_scroll_delay(int ms); |
39 | void lcd_remote_scroll_stop_line(const struct viewport* vp, int y); | 45 | |
46 | extern void lcd_remote_scroll_stop(void); | ||
47 | extern void lcd_remote_scroll_stop_viewport(const struct viewport *vp); | ||
48 | extern void lcd_remote_scroll_stop_viewport_line(const struct viewport *vp, int line); | ||
49 | extern void lcd_remote_scroll_fn(void); | ||
40 | #endif | 50 | #endif |
41 | 51 | ||
42 | /* internal usage, but in multiple drivers */ | 52 | /* internal usage, but in multiple drivers */ |