diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2006-06-06 22:23:52 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2006-06-06 22:23:52 +0000 |
| commit | 0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f (patch) | |
| tree | e3e77d4e6b25b82c82b3570cd8c4a988c7788e66 /apps/misc.c | |
| parent | 8c9e22580e220b793130ed3ac67b9c54e85b3d0f (diff) | |
| download | rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.zip rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.tar.gz rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.tar.bz2 rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.tar.xz | |
Work-in-progress rework of charging status reading & display: * Changed several charging related HAVE_* macros into one multi-value CONFIG_CHARGING. * Always use proper macros for charging states. * Battery symbol charging animation now starts from current level on all targets with charging. Two-colour animation kept for non-b&w targets. Round down fill level while charging as before, but round to nearest pixel value for discharging on all targets. * Charging anim fixed on player. * Some code cleanup.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10080 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/misc.c')
| -rw-r--r-- | apps/misc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/misc.c b/apps/misc.c index 96f913a..0ab826c 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -491,7 +491,7 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter) return false; } -#if defined(HAVE_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING) +#if defined(CONFIG_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING) if(!charger_inserted()) #endif { @@ -509,7 +509,7 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter) return false; } -#ifdef HAVE_CHARGING +#ifdef CONFIG_CHARGING static bool waiting_to_resume_play = false; static long play_resume_tick; @@ -584,7 +584,7 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame if (!clean_shutdown(callback, parameter)) return SYS_POWEROFF; break; -#ifdef HAVE_CHARGING +#ifdef CONFIG_CHARGING case SYS_CHARGER_CONNECTED: car_adapter_mode_processing(true); return SYS_CHARGER_CONNECTED; |