From 81df953da55e75632b5efbe676f2b348e11b2c4b Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Thu, 22 Jan 2009 10:50:11 +0000 Subject: Rename software backlight fading files, as we don't call it thread fading. Correct a copyright info too. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19818 a1c6a512-1295-4272-9138-f99709370657 --- firmware/SOURCES | 2 +- firmware/backlight-sw-fading.c | 87 +++++++++++++++++++++++++++++++ firmware/backlight-thread-fading.c | 87 ------------------------------- firmware/backlight.c | 2 +- firmware/export/backlight-sw-fading.h | 46 ++++++++++++++++ firmware/export/backlight-thread-fading.h | 46 ---------------- 6 files changed, 135 insertions(+), 135 deletions(-) create mode 100644 firmware/backlight-sw-fading.c delete mode 100644 firmware/backlight-thread-fading.c create mode 100644 firmware/export/backlight-sw-fading.h delete mode 100644 firmware/export/backlight-thread-fading.h diff --git a/firmware/SOURCES b/firmware/SOURCES index 7169a669e8..bce384e1c8 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -97,7 +97,7 @@ drivers/lcd-remote-2bit-vi.c #endif /* HAVE_REMOTE_LCD */ #ifdef USE_BACKLIGHT_SW_FADING -backlight-thread-fading.c +backlight-sw-fading.c #endif /* USE_BACKLIGHT_SW_FADING */ /* Misc. */ diff --git a/firmware/backlight-sw-fading.c b/firmware/backlight-sw-fading.c new file mode 100644 index 0000000000..d7987567ce --- /dev/null +++ b/firmware/backlight-sw-fading.c @@ -0,0 +1,87 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2008 by Thomas Martitz + * Copyright (C) 2008 by Martin Ritter + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include +#include "backlight-target.h" +#include "config.h" +#include "system.h" +#include "backlight.h" +#include "backlight-sw-fading.h" + +/* To adapt a target do: + * - make sure _backlight_on doesn't set the brightness to something other than + * the previous value (lowest brightness in most cases) + * - #define USE_BACKLIGHT_SW_FADING in config-.h + */ + +/* can be MIN_BRIGHTNESS_SETTING-1 */ +static int current_brightness = DEFAULT_BRIGHTNESS_SETTING; + +void _backlight_fade_update_state(int brightness) +{ + current_brightness = brightness; +} + +/* returns true if fade is finished */ +static bool _backlight_fade_up(void) +{ + if (LIKELY(current_brightness < backlight_brightness)) + { + _backlight_set_brightness(++current_brightness); + } + return(current_brightness >= backlight_brightness); +} + +/* returns true if fade is finished */ +static bool _backlight_fade_down(void) +{ + if (LIKELY(current_brightness > MIN_BRIGHTNESS_SETTING)) + { + _backlight_set_brightness(--current_brightness); + return false; + } + else + { + /* decrement once more, since backlight is off */ + current_brightness--; + _backlight_off(); + return true; + } +} + +bool _backlight_fade_step(int direction) +{ + bool done; + switch(direction) + { + case FADING_UP: + done = _backlight_fade_up(); + break; + case FADING_DOWN: + done = _backlight_fade_down(); + break; + default: + done = true; + break; + } + return(done); +} diff --git a/firmware/backlight-thread-fading.c b/firmware/backlight-thread-fading.c deleted file mode 100644 index a1afc091d3..0000000000 --- a/firmware/backlight-thread-fading.c +++ /dev/null @@ -1,87 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 by Thomas Martitz - * Copyright (C) 2008 by Martin Ritter - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include -#include "backlight-target.h" -#include "config.h" -#include "system.h" -#include "backlight.h" -#include "backlight-thread-fading.h" - -/* To adapt a target do: - * - make sure _backlight_on doesn't set the brightness to something other than - * the previous value (lowest brightness in most cases) - * - #define USE_BACKLIGHT_SW_FADING in config-.h - */ - -/* can be MIN_BRIGHTNESS_SETTING-1 */ -static int current_brightness = DEFAULT_BRIGHTNESS_SETTING; - -void _backlight_fade_update_state(int brightness) -{ - current_brightness = brightness; -} - -/* returns true if fade is finished */ -static bool _backlight_fade_up(void) -{ - if (LIKELY(current_brightness < backlight_brightness)) - { - _backlight_set_brightness(++current_brightness); - } - return(current_brightness >= backlight_brightness); -} - -/* returns true if fade is finished */ -static bool _backlight_fade_down(void) -{ - if (LIKELY(current_brightness > MIN_BRIGHTNESS_SETTING)) - { - _backlight_set_brightness(--current_brightness); - return false; - } - else - { - /* decrement once more, since backlight is off */ - current_brightness--; - _backlight_off(); - return true; - } -} - -bool _backlight_fade_step(int direction) -{ - bool done; - switch(direction) - { - case FADING_UP: - done = _backlight_fade_up(); - break; - case FADING_DOWN: - done = _backlight_fade_down(); - break; - default: - done = true; - break; - } - return(done); -} diff --git a/firmware/backlight.c b/firmware/backlight.c index f0a0bb518b..c598a9528f 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c @@ -53,7 +53,7 @@ int backlight_brightness = DEFAULT_BRIGHTNESS_SETTING; #endif #ifdef USE_BACKLIGHT_SW_FADING -#include "backlight-thread-fading.h" +#include "backlight-sw-fading.h" #endif #ifdef SIMULATOR /* TODO: find a better way to do it but we need a kernel thread somewhere to diff --git a/firmware/export/backlight-sw-fading.h b/firmware/export/backlight-sw-fading.h new file mode 100644 index 0000000000..54f732709a --- /dev/null +++ b/firmware/export/backlight-sw-fading.h @@ -0,0 +1,46 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2008 by Thomas Martitz + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#ifndef BACKLIGHT_THREAD_FADING_H +#define BACKLIGHT_THREAD_FADING_H + +#include "config.h" + +#ifdef USE_BACKLIGHT_SW_FADING + +/* delay supposed to be MAX_BRIGHTNESS_SETTING*2 rounded to the next multiple + * of 5, however not more than 40 */ +#define _FADE_DELAY (((MAX_BRIGHTNESS_SETTING*2+4)/5)*5) +#define FADE_DELAY (HZ/(MIN(_FADE_DELAY, 40))) + +void _backlight_fade_update_state(int brightness); +bool _backlight_fade_step(int direction); + +/* enum used for both, fading state and fading type selected through the settings */ + +enum { + NOT_FADING = 0, + FADING_UP, + FADING_DOWN, +}; +#endif /* USE_BACKLIGHT_SW_FADING */ + +#endif /* _BACKLIGHT_THREAD_FADING_ */ diff --git a/firmware/export/backlight-thread-fading.h b/firmware/export/backlight-thread-fading.h deleted file mode 100644 index 2a676ef63c..0000000000 --- a/firmware/export/backlight-thread-fading.h +++ /dev/null @@ -1,46 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2007 by Will Robertson - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#ifndef BACKLIGHT_THREAD_FADING_H -#define BACKLIGHT_THREAD_FADING_H - -#include "config.h" - -#ifdef USE_BACKLIGHT_SW_FADING - -/* delay supposed to be MAX_BRIGHTNESS_SETTING*2 rounded to the next multiple - * of 5, however not more than 40 */ -#define _FADE_DELAY (((MAX_BRIGHTNESS_SETTING*2+4)/5)*5) -#define FADE_DELAY (HZ/(MIN(_FADE_DELAY, 40))) - -void _backlight_fade_update_state(int brightness); -bool _backlight_fade_step(int direction); - -/* enum used for both, fading state and fading type selected through the settings */ - -enum { - NOT_FADING = 0, - FADING_UP, - FADING_DOWN, -}; -#endif /* USE_BACKLIGHT_SW_FADING */ - -#endif /* _BACKLIGHT_THREAD_FADING_ */ -- cgit v1.2.3