diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-01-19 22:56:37 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-01-19 22:56:37 +0000 |
commit | b5e1a1cc59fbba215b5e6c4f493800405787cd99 (patch) | |
tree | 31e89bafc1d4ea75ad2fd4778c4aee51d209fb15 | |
parent | 93bba4700155b21b9f0ef4fcf043db1f6bc41e25 (diff) | |
download | rockbox-b5e1a1cc59fbba215b5e6c4f493800405787cd99.tar.gz rockbox-b5e1a1cc59fbba215b5e6c4f493800405787cd99.zip |
Fix red, moved around a bit to much.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24291 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | uisimulator/common/backlight-sim.c | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/uisimulator/common/backlight-sim.c b/uisimulator/common/backlight-sim.c index aa8fe8e844..f5da77a782 100644 --- a/uisimulator/common/backlight-sim.c +++ b/uisimulator/common/backlight-sim.c | |||
@@ -30,17 +30,28 @@ 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 | |||
38 | |||
39 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | ||
40 | |||
33 | static inline int normalize_backlight(int val) | 41 | static inline int normalize_backlight(int val) |
34 | { | 42 | { |
35 | /* normalize to xx% brightness for sdl */ | 43 | /* normalize to xx% brightness for sdl */ |
36 | return ((val - MIN_BRIGHTNESS_SETTING + 1) * 100)/MAX_BRIGHTNESS_SETTING; | 44 | return ((val - MIN_BRIGHTNESS_SETTING + 1) * 100)/MAX_BRIGHTNESS_SETTING; |
37 | } | 45 | } |
38 | 46 | ||
39 | bool _backlight_init(void) | 47 | void _backlight_set_brightness(int val) |
40 | { | 48 | { |
41 | return true; | 49 | sim_backlight(normalize_backlight(val)); |
42 | } | 50 | } |
43 | 51 | ||
52 | #endif /* HAVE_BACKLIGHT_BRIGHTNESS */ | ||
53 | |||
54 | |||
44 | void _backlight_on(void) | 55 | void _backlight_on(void) |
45 | { | 56 | { |
46 | #if defined(HAVE_LCD_ENABLE) | 57 | #if defined(HAVE_LCD_ENABLE) |
@@ -51,7 +62,12 @@ void _backlight_on(void) | |||
51 | #if (CONFIG_BACKLIGHT_FADING != BACKLIGHT_FADING_SW_SETTING) | 62 | #if (CONFIG_BACKLIGHT_FADING != BACKLIGHT_FADING_SW_SETTING) |
52 | /* if we set the brightness to the settings value, then fading up | 63 | /* if we set the brightness to the settings value, then fading up |
53 | * is glitchy */ | 64 | * is glitchy */ |
65 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | ||
54 | sim_backlight(normalize_backlight(backlight_brightness)); | 66 | sim_backlight(normalize_backlight(backlight_brightness)); |
67 | #else | ||
68 | sim_backlight(100); | ||
69 | #endif | ||
70 | |||
55 | #endif | 71 | #endif |
56 | } | 72 | } |
57 | 73 | ||
@@ -63,12 +79,7 @@ void _backlight_off(void) | |||
63 | #endif | 79 | #endif |
64 | } | 80 | } |
65 | 81 | ||
66 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 82 | |
67 | void _backlight_set_brightness(int val) | ||
68 | { | ||
69 | sim_backlight(normalize_backlight(val)); | ||
70 | } | ||
71 | #endif /* HAVE_BACKLIGHT_BRIGHTNESS */ | ||
72 | #ifdef HAVE_BUTTON_LIGHT | 83 | #ifdef HAVE_BUTTON_LIGHT |
73 | void _buttonlight_on(void) | 84 | void _buttonlight_on(void) |
74 | { | 85 | { |