diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2002-10-01 11:06:22 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2002-10-01 11:06:22 +0000 |
| commit | ad19f6f9120abb2c97ba7fc1868ece1ce8e5aa0d (patch) | |
| tree | 7c6d78b538fd06f3de3c3853bb800c8dca1463a2 | |
| parent | b95fe1afc694ab97b6f39fc4bd0baa238e687a8f (diff) | |
fixed for player, removed dependency on CHARGER_CTRL
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2465 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/backlight.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c index 8a7c4ceb76..a1d8305d4e 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c @@ -35,10 +35,8 @@ static char backlight_stack[DEFAULT_STACK_SIZE]; static char backlight_thread_name[] = "backlight"; static struct event_queue backlight_queue; -#ifdef HAVE_CHARGE_CTRL static bool charger_was_inserted = 0; static bool backlight_on_when_charging = 0; -#endif static int backlight_timer; static int backlight_timeout = 5; @@ -58,7 +56,6 @@ void backlight_thread(void) switch(ev.id) { case BACKLIGHT_ON: -#ifdef HAVE_CHARGE_CTRL if( backlight_on_when_charging && charger_inserted() ) { /* Forcing to zero keeps the lights on */ @@ -66,11 +63,11 @@ void backlight_thread(void) } else { - backlight_timer = HZ*timeout_value[backlight_timeout]; + backlight_timer = HZ*timeout_value[backlight_timeout]; } -#else + backlight_timer = HZ*timeout_value[backlight_timeout]; -#endif + if(backlight_timer < 0) { backlight_timer = 0; /* timer value 0 will not get ticked */ @@ -139,14 +136,14 @@ void backlight_set_on_when_charging(bool yesno) void backlight_tick(void) { -#ifdef HAVE_CHARGE_CTRL - bool charger_is_inserted = charger_inserted(); - if( backlight_on_when_charging && (charger_was_inserted != charger_is_inserted) ) + bool charger_is_inserted = charger_inserted(); + if( backlight_on_when_charging && + (charger_was_inserted != charger_is_inserted) ) { backlight_on(); } charger_was_inserted = charger_is_inserted; -#endif + if(backlight_timer) { backlight_timer--; |