devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix red fbc8b2156f

Browse source 
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
This commit is contained in:
William Wilgus 2024-08-28 21:19:12 -04:00
parent fbc8b2156f
commit 49bbfe7505
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/drivers/lcd-scroll.c
View file

@ -24,8 +24,6 @@
/* This file is meant to be #included by scroll_engine.c (twice if a remote /* This file is meant to be #included by scroll_engine.c (twice if a remote
* is present) */ * is present) */
#include "misc.h"
#include "settings.h"
#ifndef LCDFN /* Not compiling for remote - define macros for main LCD. */ #ifndef LCDFN /* Not compiling for remote - define macros for main LCD. */
#define LCDFN(fn) lcd_ ## fn #define LCDFN(fn) lcd_ ## fn
#define LCDM(ma) LCD_ ## ma #define LCDM(ma) LCD_ ## ma

4
firmware/scroll_engine.c
View file

@ -32,6 +32,10 @@
#include "usb.h" #include "usb.h"
#include "lcd.h" #include "lcd.h"
#include "font.h" #include "font.h"
#if !defined(BOOTLOADER)
#include "misc.h"
#include "settings.h"
#endif
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
#include "lcd-remote.h" #include "lcd-remote.h"
#endif #endif