diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-06-21 17:26:50 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-06-21 17:26:50 +0000 |
commit | 4e26db3f35568e93fc3d2857a083d2889b7959c6 (patch) | |
tree | 63732364b9ce9334f210cf4790f5ca10822a16b8 /firmware/backlight.c | |
parent | 637010541af5677acc676e8c770d07cc8a3187dd (diff) | |
download | rockbox-4e26db3f35568e93fc3d2857a083d2889b7959c6.tar.gz rockbox-4e26db3f35568e93fc3d2857a083d2889b7959c6.zip |
I shouldn't have touched backlight.c at all :\ Also fix the yellow in peakmeter.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27022 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/backlight.c')
-rw-r--r-- | firmware/backlight.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c index 5406f1eeec..f9575dfdb7 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c | |||
@@ -37,8 +37,6 @@ | |||
37 | #include "lcd.h" | 37 | #include "lcd.h" |
38 | #include "screendump.h" | 38 | #include "screendump.h" |
39 | 39 | ||
40 | #ifdef HAVE_BACKLIGHT | ||
41 | |||
42 | #ifdef HAVE_REMOTE_LCD | 40 | #ifdef HAVE_REMOTE_LCD |
43 | #include "lcd-remote.h" | 41 | #include "lcd-remote.h" |
44 | #endif | 42 | #endif |
@@ -49,7 +47,7 @@ | |||
49 | #include "backlight-sim.h" | 47 | #include "backlight-sim.h" |
50 | #endif | 48 | #endif |
51 | 49 | ||
52 | #if defined(BACKLIGHT_FULL_INIT) | 50 | #if defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT) |
53 | 51 | ||
54 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \ | 52 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \ |
55 | || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG) | 53 | || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG) |
@@ -962,13 +960,16 @@ void buttonlight_set_brightness(int val) | |||
962 | } | 960 | } |
963 | #endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */ | 961 | #endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */ |
964 | 962 | ||
965 | #else /* !defined(BACKLIGHT_FULL_INIT) | 963 | #else /* !defined(HAVE_BACKLIGHT) || !defined(BACKLIGHT_FULL_INIT) |
966 | -- no backlight, empty dummy functions */ | 964 | -- no backlight, empty dummy functions */ |
965 | |||
966 | #if defined(HAVE_BACKLIGHT) && !defined(BACKLIGHT_FULL_INIT) | ||
967 | void backlight_init(void) | 967 | void backlight_init(void) |
968 | { | 968 | { |
969 | (void)_backlight_init(); | 969 | (void)_backlight_init(); |
970 | _backlight_on(); | 970 | _backlight_on(); |
971 | } | 971 | } |
972 | #endif | ||
972 | 973 | ||
973 | void backlight_on(void) {} | 974 | void backlight_on(void) {} |
974 | void backlight_off(void) {} | 975 | void backlight_off(void) {} |
@@ -997,6 +998,4 @@ void backlight_set_brightness(int val) { (void)val; } | |||
997 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS | 998 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS |
998 | void buttonlight_set_brightness(int val) { (void)val; } | 999 | void buttonlight_set_brightness(int val) { (void)val; } |
999 | #endif | 1000 | #endif |
1000 | #endif /* defined(BACKLIGHT_FULL_INIT) */ | 1001 | #endif /* defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT) */ |
1001 | |||
1002 | #endif /* HAVE_BACKLIGHT */ | ||