From 28b01fe335795c1eb87e73347567ac11a2fd12eb Mon Sep 17 00:00:00 2001 From: kugel Date: Tue, 5 May 2009 08:43:32 +0000 Subject: [PATCH] Remove an #ifdef SIMULATOR in favor of using a stub git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20853 a1c6a512-1295-4272-9138-f99709370657 --- firmware/backlight.c | 2 -- uisimulator/common/backlight-sim.c | 5 +++++ uisimulator/common/backlight-sim.h | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/firmware/backlight.c b/firmware/backlight.c index 2a2155df8..12acca00a 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c @@ -725,7 +725,6 @@ void backlight_init(void) { queue_init(&backlight_queue, true); -#ifndef SIMULATOR if (_backlight_init()) { #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM) @@ -734,7 +733,6 @@ void backlight_init(void) bl_dim_fraction = (BL_PWM_COUNT<<16); #endif } -#endif /* Leave all lights as set by the bootloader here. The settings load will * call the appropriate backlight_set_*() functions, only changing light * status if necessary. */ diff --git a/uisimulator/common/backlight-sim.c b/uisimulator/common/backlight-sim.c index ec50249dd..e8bce8ff7 100644 --- a/uisimulator/common/backlight-sim.c +++ b/uisimulator/common/backlight-sim.c @@ -30,6 +30,11 @@ extern void lcd_awake(void); /* in uisimulator/sdl/lcd-bitmap.c and lcd-charcell.c */ extern void sim_backlight(int value); +bool _backlight_init(void) +{ + return true; +} + void _backlight_on(void) { sim_backlight(100); diff --git a/uisimulator/common/backlight-sim.h b/uisimulator/common/backlight-sim.h index 366ebf809..b5b8ef2a3 100644 --- a/uisimulator/common/backlight-sim.h +++ b/uisimulator/common/backlight-sim.h @@ -24,6 +24,7 @@ #include "config.h" +bool _backlight_init(void); void _backlight_on(void); void _backlight_off(void); -- 2.11.4.GIT