Fix r31311 red and yellow.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31312 a1c6a512-1295-4272-9138-f99709370657

5 files changed, 10 insertions, 1 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 6f472106dc..55d9747f90 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -791,7 +791,6 @@ target/sh/archos/ondio/fmradio_i2c-ondio.c
 #endif /* ARCHOS_ONDIOFM || ARCHOS_ONDIOFM */
 
 #if defined(SANSA_E200) || defined(SANSA_C200)
-drivers/lcd-memframe.c
 target/arm/ata-sd-pp.c
 target/arm/i2s-pp.c
 target/arm/usb-fw-pp502x.c
@@ -803,6 +802,7 @@ target/arm/sandisk/audio-c200_e200.c
 #endif /* SANSA_E200 || SANSA_C200 */
 
 #ifdef SANSA_E200
+drivers/lcd-memframe.c
 target/arm/lcd-as-memframe.S
 target/arm/sandisk/sansa-e200/lcd-e200.c
 target/arm/sandisk/sansa-e200/button-e200.c
diff --git a/firmware/drivers/lcd-memframe.c b/firmware/drivers/lcd-memframe.c
index fda12012b9..304f0a7e9e 100644
--- a/firmware/drivers/lcd-memframe.c
+++ b/firmware/drivers/lcd-memframe.c
@@ -28,7 +28,11 @@
 
 /*** Misc. functions ***/
 
+#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
 static bool lcd_on SHAREDBSS_ATTR = false; /* Is the display turned on? */
+#else
+static bool lcd_on SHAREDBSS_ATTR = true; /* Is the display turned on? */
+#endif
 
 bool lcd_active(void)
 {
diff --git a/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c
index 8185479390..1d27716d2a 100644
--- a/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c
@@ -18,6 +18,9 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+#ifdef BOOTLOADER
+#include <string.h> /* memset */
+#endif
 #include "config.h"
 #include "system.h"
 #include "lcd.h"
diff --git a/firmware/target/arm/s3c2440/lcd-s3c2440.c b/firmware/target/arm/s3c2440/lcd-s3c2440.c
index cbf4784064..06b67c7535 100644
--- a/firmware/target/arm/s3c2440/lcd-s3c2440.c
+++ b/firmware/target/arm/s3c2440/lcd-s3c2440.c
@@ -24,6 +24,7 @@
 #include "lcd.h"
 #include "lcd-target.h"
 
+extern bool lcd_active(void);
 extern void lcd_set_active(bool active);
 
 #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
diff --git a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
index 87765802c3..b3c05fb48c 100644
--- a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
@@ -27,6 +27,7 @@
 #include "lcd.h"
 #include "lcd-target.h"
 
+extern bool lcd_active(void);
 extern void lcd_set_active(bool active);
 
 /* Power and display status */