diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-05-05 08:43:32 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-05-05 08:43:32 +0000 |
commit | b2b3f39403e4e6a03d7e0a0bdd5679a1022bb740 (patch) | |
tree | 638c7783462cc9e7cb3fdc1601c259ea650bcbe1 | |
parent | 16908adafe402193261934b1bb1e4d0d33e7c56c (diff) | |
download | rockbox-b2b3f39403e4e6a03d7e0a0bdd5679a1022bb740.tar.gz rockbox-b2b3f39403e4e6a03d7e0a0bdd5679a1022bb740.zip |
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.c | 2 | ||||
-rw-r--r-- | uisimulator/common/backlight-sim.c | 5 | ||||
-rw-r--r-- | uisimulator/common/backlight-sim.h | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c index 2a2155df8a..12acca00a7 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c | |||
@@ -725,7 +725,6 @@ void backlight_init(void) | |||
725 | { | 725 | { |
726 | queue_init(&backlight_queue, true); | 726 | queue_init(&backlight_queue, true); |
727 | 727 | ||
728 | #ifndef SIMULATOR | ||
729 | if (_backlight_init()) | 728 | if (_backlight_init()) |
730 | { | 729 | { |
731 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM) | 730 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM) |
@@ -734,7 +733,6 @@ void backlight_init(void) | |||
734 | bl_dim_fraction = (BL_PWM_COUNT<<16); | 733 | bl_dim_fraction = (BL_PWM_COUNT<<16); |
735 | #endif | 734 | #endif |
736 | } | 735 | } |
737 | #endif | ||
738 | /* Leave all lights as set by the bootloader here. The settings load will | 736 | /* Leave all lights as set by the bootloader here. The settings load will |
739 | * call the appropriate backlight_set_*() functions, only changing light | 737 | * call the appropriate backlight_set_*() functions, only changing light |
740 | * status if necessary. */ | 738 | * status if necessary. */ |
diff --git a/uisimulator/common/backlight-sim.c b/uisimulator/common/backlight-sim.c index ec50249dde..e8bce8ff7a 100644 --- a/uisimulator/common/backlight-sim.c +++ b/uisimulator/common/backlight-sim.c | |||
@@ -30,6 +30,11 @@ extern void lcd_awake(void); | |||
30 | /* in uisimulator/sdl/lcd-bitmap.c and lcd-charcell.c */ | 30 | /* in uisimulator/sdl/lcd-bitmap.c and lcd-charcell.c */ |
31 | extern void sim_backlight(int value); | 31 | extern void sim_backlight(int value); |
32 | 32 | ||
33 | bool _backlight_init(void) | ||
34 | { | ||
35 | return true; | ||
36 | } | ||
37 | |||
33 | void _backlight_on(void) | 38 | void _backlight_on(void) |
34 | { | 39 | { |
35 | sim_backlight(100); | 40 | sim_backlight(100); |
diff --git a/uisimulator/common/backlight-sim.h b/uisimulator/common/backlight-sim.h index 366ebf8096..b5b8ef2a3c 100644 --- a/uisimulator/common/backlight-sim.h +++ b/uisimulator/common/backlight-sim.h | |||
@@ -24,6 +24,7 @@ | |||
24 | 24 | ||
25 | #include "config.h" | 25 | #include "config.h" |
26 | 26 | ||
27 | bool _backlight_init(void); | ||
27 | void _backlight_on(void); | 28 | void _backlight_on(void); |
28 | void _backlight_off(void); | 29 | void _backlight_off(void); |
29 | 30 | ||