diff options
-rw-r--r-- | firmware/drivers/lcd-scroll.c | 2 | ||||
-rw-r--r-- | firmware/export/scroll_engine.h | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/firmware/drivers/lcd-scroll.c b/firmware/drivers/lcd-scroll.c index 26b15732cd..895cf98cba 100644 --- a/firmware/drivers/lcd-scroll.c +++ b/firmware/drivers/lcd-scroll.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #define MAIN_LCD | 30 | #define MAIN_LCD |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | #if !defined(BOOTLOADER) | ||
33 | static struct scrollinfo LCDFN(scroll)[LCDM(SCROLLABLE_LINES)]; | 34 | static struct scrollinfo LCDFN(scroll)[LCDM(SCROLLABLE_LINES)]; |
34 | 35 | ||
35 | struct scroll_screen_info LCDFN(scroll_info) = | 36 | struct scroll_screen_info LCDFN(scroll_info) = |
@@ -180,7 +181,6 @@ bool LCDFN(scroll_now)(struct scrollinfo *s) | |||
180 | return ended; | 181 | return ended; |
181 | } | 182 | } |
182 | 183 | ||
183 | #if !defined(BOOTLOADER) | ||
184 | static void LCDFN(scroll_worker)(void) | 184 | static void LCDFN(scroll_worker)(void) |
185 | { | 185 | { |
186 | int index; | 186 | int index; |
diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h index f13e2efca7..2a1a510dbd 100644 --- a/firmware/export/scroll_engine.h +++ b/firmware/export/scroll_engine.h | |||
@@ -38,10 +38,36 @@ extern void lcd_bidir_scroll(int threshold); | |||
38 | extern void lcd_scroll_speed(int speed); | 38 | extern void lcd_scroll_speed(int speed); |
39 | extern void lcd_scroll_delay(int ms); | 39 | extern void lcd_scroll_delay(int ms); |
40 | 40 | ||
41 | #ifdef BOOTLOADER | ||
42 | static inline void lcd_scroll_stop(void) | ||
43 | { | ||
44 | } | ||
45 | |||
46 | static inline void lcd_scroll_stop_viewport(const struct viewport *vp) | ||
47 | { | ||
48 | (void)vp; | ||
49 | } | ||
50 | |||
51 | static inline void lcd_scroll_stop_viewport_rect(const struct viewport *vp, int x, int y, int width, int height) | ||
52 | { | ||
53 | (void)vp; | ||
54 | (void)x; | ||
55 | (void)y; | ||
56 | (void)width; | ||
57 | (void)height; | ||
58 | } | ||
59 | |||
60 | static inline bool lcd_scroll_now(struct scrollinfo *scroll) | ||
61 | { | ||
62 | (void)scroll; | ||
63 | return false; | ||
64 | } | ||
65 | #else | ||
41 | extern void lcd_scroll_stop(void); | 66 | extern void lcd_scroll_stop(void); |
42 | extern void lcd_scroll_stop_viewport(const struct viewport *vp); | 67 | extern void lcd_scroll_stop_viewport(const struct viewport *vp); |
43 | extern void lcd_scroll_stop_viewport_rect(const struct viewport *vp, int x, int y, int width, int height); | 68 | extern void lcd_scroll_stop_viewport_rect(const struct viewport *vp, int x, int y, int width, int height); |
44 | extern bool lcd_scroll_now(struct scrollinfo *scroll); | 69 | extern bool lcd_scroll_now(struct scrollinfo *scroll); |
70 | #endif | ||
45 | #ifdef HAVE_REMOTE_LCD | 71 | #ifdef HAVE_REMOTE_LCD |
46 | extern void lcd_remote_scroll_speed(int speed); | 72 | extern void lcd_remote_scroll_speed(int speed); |
47 | extern void lcd_remote_scroll_delay(int ms); | 73 | extern void lcd_remote_scroll_delay(int ms); |