summaryrefslogtreecommitdiffstats
path: root/firmware/backlight.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-06-21 17:26:50 +0000
committerThomas Martitz <kugel@rockbox.org>2010-06-21 17:26:50 +0000
commit4e26db3f35568e93fc3d2857a083d2889b7959c6 (patch)
tree63732364b9ce9334f210cf4790f5ca10822a16b8 /firmware/backlight.c
parent637010541af5677acc676e8c770d07cc8a3187dd (diff)
downloadrockbox-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.c13
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 @@
#include "lcd.h"
#include "screendump.h"
-#ifdef HAVE_BACKLIGHT
-
#ifdef HAVE_REMOTE_LCD
#include "lcd-remote.h"
#endif
@@ -49,7 +47,7 @@
#include "backlight-sim.h"
#endif
-#if defined(BACKLIGHT_FULL_INIT)
+#if defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT)
#if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \
|| (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG)
@@ -962,13 +960,16 @@ void buttonlight_set_brightness(int val)
}
#endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */
-#else /* !defined(BACKLIGHT_FULL_INIT)
+#else /* !defined(HAVE_BACKLIGHT) || !defined(BACKLIGHT_FULL_INIT)
-- no backlight, empty dummy functions */
+
+#if defined(HAVE_BACKLIGHT) && !defined(BACKLIGHT_FULL_INIT)
void backlight_init(void)
{
(void)_backlight_init();
_backlight_on();
}
+#endif
void backlight_on(void) {}
void backlight_off(void) {}
@@ -997,6 +998,4 @@ void backlight_set_brightness(int val) { (void)val; }
#ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
void buttonlight_set_brightness(int val) { (void)val; }
#endif
-#endif /* defined(BACKLIGHT_FULL_INIT) */
-
-#endif /* HAVE_BACKLIGHT */
+#endif /* defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT) */