diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/SOURCES | 2 | ||||
-rw-r--r-- | firmware/drivers/lcd-memframe.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c | 3 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/lcd-s3c2440.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/sansa-e200/lcd-e200.c | 1 |
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 | |||
791 | #endif /* ARCHOS_ONDIOFM || ARCHOS_ONDIOFM */ | 791 | #endif /* ARCHOS_ONDIOFM || ARCHOS_ONDIOFM */ |
792 | 792 | ||
793 | #if defined(SANSA_E200) || defined(SANSA_C200) | 793 | #if defined(SANSA_E200) || defined(SANSA_C200) |
794 | drivers/lcd-memframe.c | ||
795 | target/arm/ata-sd-pp.c | 794 | target/arm/ata-sd-pp.c |
796 | target/arm/i2s-pp.c | 795 | target/arm/i2s-pp.c |
797 | target/arm/usb-fw-pp502x.c | 796 | target/arm/usb-fw-pp502x.c |
@@ -803,6 +802,7 @@ target/arm/sandisk/audio-c200_e200.c | |||
803 | #endif /* SANSA_E200 || SANSA_C200 */ | 802 | #endif /* SANSA_E200 || SANSA_C200 */ |
804 | 803 | ||
805 | #ifdef SANSA_E200 | 804 | #ifdef SANSA_E200 |
805 | drivers/lcd-memframe.c | ||
806 | target/arm/lcd-as-memframe.S | 806 | target/arm/lcd-as-memframe.S |
807 | target/arm/sandisk/sansa-e200/lcd-e200.c | 807 | target/arm/sandisk/sansa-e200/lcd-e200.c |
808 | target/arm/sandisk/sansa-e200/button-e200.c | 808 | 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 @@ | |||
28 | 28 | ||
29 | /*** Misc. functions ***/ | 29 | /*** Misc. functions ***/ |
30 | 30 | ||
31 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) | ||
31 | static bool lcd_on SHAREDBSS_ATTR = false; /* Is the display turned on? */ | 32 | static bool lcd_on SHAREDBSS_ATTR = false; /* Is the display turned on? */ |
33 | #else | ||
34 | static bool lcd_on SHAREDBSS_ATTR = true; /* Is the display turned on? */ | ||
35 | #endif | ||
32 | 36 | ||
33 | bool lcd_active(void) | 37 | bool lcd_active(void) |
34 | { | 38 | { |
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 @@ | |||
18 | * KIND, either express or implied. | 18 | * KIND, either express or implied. |
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #ifdef BOOTLOADER | ||
22 | #include <string.h> /* memset */ | ||
23 | #endif | ||
21 | #include "config.h" | 24 | #include "config.h" |
22 | #include "system.h" | 25 | #include "system.h" |
23 | #include "lcd.h" | 26 | #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 @@ | |||
24 | #include "lcd.h" | 24 | #include "lcd.h" |
25 | #include "lcd-target.h" | 25 | #include "lcd-target.h" |
26 | 26 | ||
27 | extern bool lcd_active(void); | ||
27 | extern void lcd_set_active(bool active); | 28 | extern void lcd_set_active(bool active); |
28 | 29 | ||
29 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) | 30 | #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 @@ | |||
27 | #include "lcd.h" | 27 | #include "lcd.h" |
28 | #include "lcd-target.h" | 28 | #include "lcd-target.h" |
29 | 29 | ||
30 | extern bool lcd_active(void); | ||
30 | extern void lcd_set_active(bool active); | 31 | extern void lcd_set_active(bool active); |
31 | 32 | ||
32 | /* Power and display status */ | 33 | /* Power and display status */ |