summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorTobias Diedrich <ranma+coreboot@tdiedrich.de>2010-06-18 13:45:24 +0000
committerTobias Diedrich <ranma+coreboot@tdiedrich.de>2010-06-18 13:45:24 +0000
commit68e2023184ab0138a0c475e2100c1d76891ef2af (patch)
treee12ab23777f0c042fc970a8c12b886afaef87c87 /firmware/target/arm
parentbe7e835d92b6b872767c2ce1678524b06c57fd65 (diff)
downloadrockbox-68e2023184ab0138a0c475e2100c1d76891ef2af.tar.gz
rockbox-68e2023184ab0138a0c475e2100c1d76891ef2af.zip
Enable display and backlight on panic.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26917 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/as3525/sansa-c200v2/backlight-target.h7
-rw-r--r--firmware/target/arm/as3525/sansa-clip/backlight-target.h2
-rw-r--r--firmware/target/arm/as3525/sansa-clipplus/backlight-target.h1
-rw-r--r--firmware/target/arm/as3525/sansa-clipv2/backlight-target.h1
-rw-r--r--firmware/target/arm/as3525/sansa-e200v2/backlight-target.h1
-rw-r--r--firmware/target/arm/as3525/sansa-fuze/backlight-target.h1
-rw-r--r--firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h1
-rw-r--r--firmware/target/arm/as3525/sansa-m200v4/backlight-target.h2
-rw-r--r--firmware/target/arm/as3525/system-as3525.c2
9 files changed, 18 insertions, 0 deletions
diff --git a/firmware/target/arm/as3525/sansa-c200v2/backlight-target.h b/firmware/target/arm/as3525/sansa-c200v2/backlight-target.h
index c09e759138..4a098f7f28 100644
--- a/firmware/target/arm/as3525/sansa-c200v2/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-c200v2/backlight-target.h
@@ -27,6 +27,13 @@ bool _backlight_init(void);
void _backlight_pwm(int on);
void _backlight_on(void);
void _backlight_off(void);
+
+static inline void _backlight_panic_on(void)
+{
+ _backlight_on();
+ _backlight_pwm(1);
+}
+
void _backlight_set_brightness(int brightness);
int __backlight_is_on(void);
diff --git a/firmware/target/arm/as3525/sansa-clip/backlight-target.h b/firmware/target/arm/as3525/sansa-clip/backlight-target.h
index f836fb9ab2..00c6e5cc44 100644
--- a/firmware/target/arm/as3525/sansa-clip/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-clip/backlight-target.h
@@ -35,6 +35,8 @@ static inline void _backlight_off(void)
lcd_enable(false);
}
+#define _backlight_panic_on() _backlight_on()
+
static inline bool _backlight_init(void)
{
GPIOD_DIR |= (1<<7); /* for button light */
diff --git a/firmware/target/arm/as3525/sansa-clipplus/backlight-target.h b/firmware/target/arm/as3525/sansa-clipplus/backlight-target.h
index 2990083440..3dd9240bd8 100644
--- a/firmware/target/arm/as3525/sansa-clipplus/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-clipplus/backlight-target.h
@@ -25,5 +25,6 @@
void _backlight_on(void);
void _backlight_off(void);
+#define _backlight_panic_on() _backlight_on()
#endif
diff --git a/firmware/target/arm/as3525/sansa-clipv2/backlight-target.h b/firmware/target/arm/as3525/sansa-clipv2/backlight-target.h
index d8c013a64a..3000b575c7 100644
--- a/firmware/target/arm/as3525/sansa-clipv2/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-clipv2/backlight-target.h
@@ -26,6 +26,7 @@
void _backlight_on(void);
void _backlight_off(void);
+#define _backlight_panic_on() _backlight_on()
static inline bool _backlight_init(void)
{
diff --git a/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h b/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h
index db2cecc07a..227a154197 100644
--- a/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-e200v2/backlight-target.h
@@ -24,6 +24,7 @@
#define _backlight_init() true
void _backlight_on(void);
void _backlight_off(void);
+#define _backlight_panic_on() _backlight_on()
void _backlight_set_brightness(int brightness);
int __backlight_is_on(void);
diff --git a/firmware/target/arm/as3525/sansa-fuze/backlight-target.h b/firmware/target/arm/as3525/sansa-fuze/backlight-target.h
index 2d60ac35c2..df6df573b0 100644
--- a/firmware/target/arm/as3525/sansa-fuze/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-fuze/backlight-target.h
@@ -24,6 +24,7 @@
#define _backlight_init() true
void _backlight_on(void);
void _backlight_off(void);
+#define _backlight_panic_on() _backlight_on()
void _backlight_set_brightness(int brightness);
#ifdef HAVE_BUTTON_LIGHT
void _buttonlight_on(void);
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h b/firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h
index e4ed7870ec..f9d7005f79 100644
--- a/firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-fuzev2/backlight-target.h
@@ -28,6 +28,7 @@
bool _backlight_init(void);
void _backlight_on(void);
void _backlight_off(void);
+#define _backlight_panic_on() _backlight_on()
void _backlight_set_brightness(int brightness);
#ifdef HAVE_BUTTON_LIGHT
void _buttonlight_on(void);
diff --git a/firmware/target/arm/as3525/sansa-m200v4/backlight-target.h b/firmware/target/arm/as3525/sansa-m200v4/backlight-target.h
index 50404f7090..b5560bd037 100644
--- a/firmware/target/arm/as3525/sansa-m200v4/backlight-target.h
+++ b/firmware/target/arm/as3525/sansa-m200v4/backlight-target.h
@@ -37,4 +37,6 @@ static inline void _backlight_off(void)
GPIOD_PIN(1) = 0x00;
}
+#define _backlight_panic_on() _backlight_on()
+
#endif
diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c
index 5eae1a35b3..3ba56cf30a 100644
--- a/firmware/target/arm/as3525/system-as3525.c
+++ b/firmware/target/arm/as3525/system-as3525.c
@@ -392,6 +392,8 @@ void system_reboot(void)
void system_exception_wait(void)
{
+ /* make sure lcd+backlight are on */
+ _backlight_panic_on();
/* wait until button release (if a button is pressed) */
while(button_read_device());
/* then wait until next button press */