summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-05-05 08:43:32 +0000
committerThomas Martitz <kugel@rockbox.org>2009-05-05 08:43:32 +0000
commitb2b3f39403e4e6a03d7e0a0bdd5679a1022bb740 (patch)
tree638c7783462cc9e7cb3fdc1601c259ea650bcbe1
parent16908adafe402193261934b1bb1e4d0d33e7c56c (diff)
downloadrockbox-b2b3f39403e4e6a03d7e0a0bdd5679a1022bb740.zip
rockbox-b2b3f39403e4e6a03d7e0a0bdd5679a1022bb740.tar.gz
rockbox-b2b3f39403e4e6a03d7e0a0bdd5679a1022bb740.tar.bz2
rockbox-b2b3f39403e4e6a03d7e0a0bdd5679a1022bb740.tar.xz
Remove an #ifdef SIMULATOR in favor of using a stub
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20853 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/backlight.c2
-rw-r--r--uisimulator/common/backlight-sim.c5
-rw-r--r--uisimulator/common/backlight-sim.h1
3 files changed, 6 insertions, 2 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c
index 2a2155d..12acca0 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -725,7 +725,6 @@ void backlight_init(void)
{
queue_init(&backlight_queue, true);
-#ifndef SIMULATOR
if (_backlight_init())
{
#if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM)
@@ -734,7 +733,6 @@ void backlight_init(void)
bl_dim_fraction = (BL_PWM_COUNT<<16);
#endif
}
-#endif
/* Leave all lights as set by the bootloader here. The settings load will
* call the appropriate backlight_set_*() functions, only changing light
* status if necessary. */
diff --git a/uisimulator/common/backlight-sim.c b/uisimulator/common/backlight-sim.c
index ec50249..e8bce8f 100644
--- a/uisimulator/common/backlight-sim.c
+++ b/uisimulator/common/backlight-sim.c
@@ -30,6 +30,11 @@ extern void lcd_awake(void);
/* in uisimulator/sdl/lcd-bitmap.c and lcd-charcell.c */
extern void sim_backlight(int value);
+bool _backlight_init(void)
+{
+ return true;
+}
+
void _backlight_on(void)
{
sim_backlight(100);
diff --git a/uisimulator/common/backlight-sim.h b/uisimulator/common/backlight-sim.h
index 366ebf8..b5b8ef2 100644
--- a/uisimulator/common/backlight-sim.h
+++ b/uisimulator/common/backlight-sim.h
@@ -24,6 +24,7 @@
#include "config.h"
+bool _backlight_init(void);
void _backlight_on(void);
void _backlight_off(void);