diff options
author | William Wilgus <wilgus.william@gmail.com> | 2024-08-28 21:19:12 -0400 |
---|---|---|
committer | William Wilgus <wilgus.william@gmail.com> | 2024-08-28 21:26:06 -0400 |
commit | 49bbfe75054972866b9b06faea118f890ce6bc26 (patch) | |
tree | b8b5eb4cf174d9157bc38534ace7b8e607e006ae /firmware | |
parent | fbc8b2156f8b336216d859fb4621e7311d9c4f14 (diff) | |
download | rockbox-49bbfe75054972866b9b06faea118f890ce6bc26.tar.gz rockbox-49bbfe75054972866b9b06faea118f890ce6bc26.zip |
Fix red fbc8b2156f
lcd_scroll is include in a weird manner and includes need to go in
scroll_engine.c instead and still be blocked from bootloaders
Change-Id: Ic99d123f7d428d511380c7064a9453de56218a17
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/lcd-scroll.c | 2 | ||||
-rw-r--r-- | firmware/scroll_engine.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/firmware/drivers/lcd-scroll.c b/firmware/drivers/lcd-scroll.c index 8ab91ef642..2a58d6ff21 100644 --- a/firmware/drivers/lcd-scroll.c +++ b/firmware/drivers/lcd-scroll.c | |||
@@ -24,8 +24,6 @@ | |||
24 | /* This file is meant to be #included by scroll_engine.c (twice if a remote | 24 | /* This file is meant to be #included by scroll_engine.c (twice if a remote |
25 | * is present) */ | 25 | * is present) */ |
26 | 26 | ||
27 | #include "misc.h" | ||
28 | #include "settings.h" | ||
29 | #ifndef LCDFN /* Not compiling for remote - define macros for main LCD. */ | 27 | #ifndef LCDFN /* Not compiling for remote - define macros for main LCD. */ |
30 | #define LCDFN(fn) lcd_ ## fn | 28 | #define LCDFN(fn) lcd_ ## fn |
31 | #define LCDM(ma) LCD_ ## ma | 29 | #define LCDM(ma) LCD_ ## ma |
diff --git a/firmware/scroll_engine.c b/firmware/scroll_engine.c index c32f4632e2..74c08c1da5 100644 --- a/firmware/scroll_engine.c +++ b/firmware/scroll_engine.c | |||
@@ -32,6 +32,10 @@ | |||
32 | #include "usb.h" | 32 | #include "usb.h" |
33 | #include "lcd.h" | 33 | #include "lcd.h" |
34 | #include "font.h" | 34 | #include "font.h" |
35 | #if !defined(BOOTLOADER) | ||
36 | #include "misc.h" | ||
37 | #include "settings.h" | ||
38 | #endif | ||
35 | #ifdef HAVE_REMOTE_LCD | 39 | #ifdef HAVE_REMOTE_LCD |
36 | #include "lcd-remote.h" | 40 | #include "lcd-remote.h" |
37 | #endif | 41 | #endif |