summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-04-25 18:39:05 +0000
committerThomas Martitz <kugel@rockbox.org>2009-04-25 18:39:05 +0000
commit7a4145c47a6d4608a4e443cb2ac23f05c0240d7f (patch)
tree8a8709ae20e5d3e0ebc4d1da5a2c953346755d13
parent0017dfbe8291142aefa832cf6c34e039376b826d (diff)
downloadrockbox-7a4145c47a6d4608a4e443cb2ac23f05c0240d7f.tar.gz
rockbox-7a4145c47a6d4608a4e443cb2ac23f05c0240d7f.zip
Fix red.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20785 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/backlight.c5
-rw-r--r--firmware/export/backlight.h11
2 files changed, 11 insertions, 5 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c
index 2d9c963cab..cff76a249c 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -44,11 +44,6 @@
44#include "backlight-target.h" 44#include "backlight-target.h"
45#endif 45#endif
46 46
47#if !defined(BOOTLOADER)
48/* The whole driver should be built */
49#define BACKLIGHT_FULL_INIT
50#endif
51
52 47
53#if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \ 48#if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \
54 || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG) 49 || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG)
diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h
index ad06a670e1..1df262fbf2 100644
--- a/firmware/export/backlight.h
+++ b/firmware/export/backlight.h
@@ -23,6 +23,13 @@
23 23
24#include "config.h" 24#include "config.h"
25 25
26
27
28#if !defined(BOOTLOADER)
29/* The whole driver should be built */
30#define BACKLIGHT_FULL_INIT
31#endif
32
26bool is_backlight_on(bool ignore_always_off); 33bool is_backlight_on(bool ignore_always_off);
27void backlight_on(void); 34void backlight_on(void);
28void backlight_off(void); 35void backlight_off(void);
@@ -79,7 +86,11 @@ void sim_remote_backlight(int value);
79#endif 86#endif
80 87
81#ifdef HAVE_BACKLIGHT_BRIGHTNESS 88#ifdef HAVE_BACKLIGHT_BRIGHTNESS
89#ifdef BACKLIGHT_FULL_INIT
82extern int backlight_brightness; 90extern int backlight_brightness;
91#else
92#define backlight_brightness DEFAULT_BRIGHTNESS_SETTING
93#endif
83void backlight_set_brightness(int val); 94void backlight_set_brightness(int val);
84#endif /* HAVE_BACKLIGHT_BRIGHTNESS */ 95#endif /* HAVE_BACKLIGHT_BRIGHTNESS */
85 96