Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

I shouldn't have touched backlight.c at all :\ Also fix the yellow in peakmeter.c

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27022 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-06-21 17:26:50 +00:00
parent 637010541a
commit 4e26db3f35
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/recorder/peakmeter.c
View file

@ -18,10 +18,10 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
****************************************************************************/ ****************************************************************************/
#include "config.h"
#if defined(SIMULATOR) && (CONFIG_CODEC != SWCODEC) #if defined(SIMULATOR) && (CONFIG_CODEC != SWCODEC)
#include <stdlib.h> /* sim uses rand for peakmeter simulation */ #include <stdlib.h> /* sim uses rand for peakmeter simulation */
#endif #endif
#include "config.h"
#include "mas.h" #include "mas.h"
#include "thread.h" #include "thread.h"
#include "kernel.h" #include "kernel.h"

13
firmware/backlight.c
View file

@ -37,8 +37,6 @@
#include "lcd.h" #include "lcd.h"
#include "screendump.h" #include "screendump.h"
#ifdef HAVE_BACKLIGHT
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
#include "lcd-remote.h" #include "lcd-remote.h"
#endif #endif
@ -49,7 +47,7 @@
#include "backlight-sim.h" #include "backlight-sim.h"
#endif #endif
#if defined(BACKLIGHT_FULL_INIT) #if defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT)
#if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \ #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \
|| (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG) || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG)
@ -962,13 +960,16 @@ void buttonlight_set_brightness(int val)
} }
#endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */ #endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */
#else /* !defined(BACKLIGHT_FULL_INIT) #else /* !defined(HAVE_BACKLIGHT) || !defined(BACKLIGHT_FULL_INIT)
-- no backlight, empty dummy functions */ -- no backlight, empty dummy functions */
#if defined(HAVE_BACKLIGHT) && !defined(BACKLIGHT_FULL_INIT)
void backlight_init(void) void backlight_init(void)
{ {
(void)_backlight_init(); (void)_backlight_init();
_backlight_on(); _backlight_on();
} }
#endif
void backlight_on(void) {} void backlight_on(void) {}
void backlight_off(void) {} void backlight_off(void) {}
@ -997,6 +998,4 @@ void backlight_set_brightness(int val) { (void)val; }
#ifdef HAVE_BUTTONLIGHT_BRIGHTNESS #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
void buttonlight_set_brightness(int val) { (void)val; } void buttonlight_set_brightness(int val) { (void)val; }
#endif #endif
#endif /* defined(BACKLIGHT_FULL_INIT) */ #endif /* defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT) */
#endif /* HAVE_BACKLIGHT */