diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-19 19:38:45 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 0c4f89370d05056faa789aa9cabcccc4e509fb9f (patch) | |
tree | 6ddf7fff0a47564db41d39927ea1acbdb03e74ee /firmware/drivers/lcd-scroll.c | |
parent | 092c340a2062fa98b7387fc5fd63578ddae7d0b6 (diff) | |
download | rockbox-0c4f89370d05056faa789aa9cabcccc4e509fb9f.tar.gz rockbox-0c4f89370d05056faa789aa9cabcccc4e509fb9f.zip |
[2/4] get rid of HAVE_LCD_CHARCELLS
HAVE_LCD_BITMAP is now redundant.
lcd_bitmap is always-on in features.txt so manual and lang strings
don't have to change
Change-Id: I08eeb20de48099ffc2dc23782711af368c2ec794
Diffstat (limited to 'firmware/drivers/lcd-scroll.c')
-rw-r--r-- | firmware/drivers/lcd-scroll.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/firmware/drivers/lcd-scroll.c b/firmware/drivers/lcd-scroll.c index 0e17303bd3..7916556dfb 100644 --- a/firmware/drivers/lcd-scroll.c +++ b/firmware/drivers/lcd-scroll.c | |||
@@ -42,10 +42,6 @@ struct scroll_screen_info LCDFN(scroll_info) = | |||
42 | #ifdef HAVE_LCD_BITMAP | 42 | #ifdef HAVE_LCD_BITMAP |
43 | .step = 6, | 43 | .step = 6, |
44 | #endif | 44 | #endif |
45 | #ifdef HAVE_LCD_CHARCELLS | ||
46 | .jump_scroll_delay = HZ/4, | ||
47 | .jump_scroll = 0, | ||
48 | #endif | ||
49 | }; | 45 | }; |
50 | 46 | ||
51 | 47 | ||
@@ -121,17 +117,6 @@ void LCDFN(bidir_scroll)(int percent) | |||
121 | LCDFN(scroll_info).bidir_limit = percent; | 117 | LCDFN(scroll_info).bidir_limit = percent; |
122 | } | 118 | } |
123 | 119 | ||
124 | #ifdef HAVE_LCD_CHARCELLS | ||
125 | void LCDFN(jump_scroll)(int mode) /* 0=off, 1=once, ..., JUMP_SCROLL_ALWAYS */ | ||
126 | { | ||
127 | LCDFN(scroll_info).jump_scroll = mode; | ||
128 | } | ||
129 | |||
130 | void LCDFN(jump_scroll_delay)(int ms) | ||
131 | { | ||
132 | LCDFN(scroll_info).jump_scroll_delay = ms / (HZ / 10); | ||
133 | } | ||
134 | #endif | ||
135 | 120 | ||
136 | /* This renders the scrolling line described by s immediatly. | 121 | /* This renders the scrolling line described by s immediatly. |
137 | * This can be called to update a scrolling line if the text has changed | 122 | * This can be called to update a scrolling line if the text has changed |
@@ -201,7 +186,7 @@ bool LCDFN(scroll_now)(struct scrollinfo *s) | |||
201 | return ended; | 186 | return ended; |
202 | } | 187 | } |
203 | 188 | ||
204 | #if !defined(BOOTLOADER) || defined(HAVE_REMOTE_LCD) || defined(HAVE_LCD_CHARCELLS) | 189 | #if !defined(BOOTLOADER) || defined(HAVE_REMOTE_LCD) |
205 | static void LCDFN(scroll_worker)(void) | 190 | static void LCDFN(scroll_worker)(void) |
206 | { | 191 | { |
207 | int index; | 192 | int index; |