diff options
author | William Wilgus <me.theuser@yahoo.com> | 2017-11-06 23:30:04 +0100 |
---|---|---|
committer | Michael Giacomelli <giac2000@hotmail.com> | 2018-05-23 00:37:27 +0100 |
commit | 0999a22ef87dcf57e4c3494f2a4c6a708263ad8b (patch) | |
tree | 2825733822d9f864930c49420791f4f85379987c /firmware | |
parent | 0b2f5187a3e607c3c3981359d4b8b0c726d1accb (diff) | |
download | rockbox-0999a22ef87dcf57e4c3494f2a4c6a708263ad8b.tar.gz rockbox-0999a22ef87dcf57e4c3494f2a4c6a708263ad8b.zip |
Remove lcd_scroll_worker from bootloader except remote displays and charcell
Removes unneeded scrolling fuctionality from bootloaders
Change-Id: Iebe308144cc11c9139399702e3dcd1a548cb9831
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/lcd-scroll.c | 3 | ||||
-rw-r--r-- | firmware/scroll_engine.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/firmware/drivers/lcd-scroll.c b/firmware/drivers/lcd-scroll.c index 5162f9a100..74606b1ed7 100644 --- a/firmware/drivers/lcd-scroll.c +++ b/firmware/drivers/lcd-scroll.c | |||
@@ -200,7 +200,7 @@ bool LCDFN(scroll_now)(struct scrollinfo *s) | |||
200 | 200 | ||
201 | return ended; | 201 | return ended; |
202 | } | 202 | } |
203 | 203 | #if (!defined(BOOTLOADER) && !defined(HAVE_REMOTE_LCD)) || defined(HAVE_LCD_CHARCELLS) | |
204 | static void LCDFN(scroll_worker)(void) | 204 | static void LCDFN(scroll_worker)(void) |
205 | { | 205 | { |
206 | int index; | 206 | int index; |
@@ -251,3 +251,4 @@ static void LCDFN(scroll_worker)(void) | |||
251 | s->start_tick += si->delay + si->ticks; | 251 | s->start_tick += si->delay + si->ticks; |
252 | } | 252 | } |
253 | } | 253 | } |
254 | #endif /*!BOOTLOADER*/ | ||
diff --git a/firmware/scroll_engine.c b/firmware/scroll_engine.c index cb0051dac7..aacaa496e7 100644 --- a/firmware/scroll_engine.c +++ b/firmware/scroll_engine.c | |||
@@ -185,10 +185,12 @@ static void scroll_thread(void) | |||
185 | while (1) | 185 | while (1) |
186 | { | 186 | { |
187 | sleep(lcd_scroll_info.ticks); | 187 | sleep(lcd_scroll_info.ticks); |
188 | #if !defined(BOOTLOADER) || defined(HAVE_LCD_CHARCELLS) | ||
188 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) | 189 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
189 | if (lcd_active()) | 190 | if (lcd_active()) |
190 | #endif | 191 | #endif |
191 | lcd_scroll_worker(); | 192 | lcd_scroll_worker(); |
193 | #endif /*!BOOTLOADER\HAVE_LCD_CHARCELLS*/ | ||
192 | } | 194 | } |
193 | } | 195 | } |
194 | #endif /* HAVE_REMOTE_LCD */ | 196 | #endif /* HAVE_REMOTE_LCD */ |