summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Wilgus <me.theuser@yahoo.com>2017-11-06 23:30:04 +0100
committerMichael Giacomelli <giac2000@hotmail.com>2018-05-23 00:37:27 +0100
commit0999a22ef87dcf57e4c3494f2a4c6a708263ad8b (patch)
tree2825733822d9f864930c49420791f4f85379987c
parent0b2f5187a3e607c3c3981359d4b8b0c726d1accb (diff)
downloadrockbox-0999a22.tar.gz
rockbox-0999a22.tar.bz2
rockbox-0999a22.zip
Remove lcd_scroll_worker from bootloader except remote displays and charcell
Removes unneeded scrolling fuctionality from bootloaders Change-Id: Iebe308144cc11c9139399702e3dcd1a548cb9831
-rw-r--r--firmware/drivers/lcd-scroll.c3
-rw-r--r--firmware/scroll_engine.c2
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)
return ended;
}
-
+#if (!defined(BOOTLOADER) && !defined(HAVE_REMOTE_LCD)) || defined(HAVE_LCD_CHARCELLS)
static void LCDFN(scroll_worker)(void)
{
int index;
@@ -251,3 +251,4 @@ static void LCDFN(scroll_worker)(void)
s->start_tick += si->delay + si->ticks;
}
}
+#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)
while (1)
{
sleep(lcd_scroll_info.ticks);
+#if !defined(BOOTLOADER) || defined(HAVE_LCD_CHARCELLS)
#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
if (lcd_active())
#endif
lcd_scroll_worker();
+#endif /*!BOOTLOADER\HAVE_LCD_CHARCELLS*/
}
}
#endif /* HAVE_REMOTE_LCD */