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/main.c | |
parent | 8c9e22580e220b793130ed3ac67b9c54e85b3d0f (diff) | |
download | rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.tar.gz rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.zip |
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/main.c')
-rw-r--r-- | apps/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/main.c b/apps/main.c index 0771b287f8..5867f79d2f 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -228,7 +228,7 @@ void init(void) | |||
228 | { | 228 | { |
229 | int rc; | 229 | int rc; |
230 | bool mounted = false; | 230 | bool mounted = false; |
231 | #if defined(HAVE_CHARGING) && (CONFIG_CPU == SH7034) | 231 | #if defined(CONFIG_CHARGING) && (CONFIG_CPU == SH7034) |
232 | /* if nobody initialized ATA before, I consider this a cold start */ | 232 | /* if nobody initialized ATA before, I consider this a cold start */ |
233 | bool coldstart = (PACR2 & 0x4000) != 0; /* starting from Flash */ | 233 | bool coldstart = (PACR2 & 0x4000) != 0; /* starting from Flash */ |
234 | #endif | 234 | #endif |
@@ -295,7 +295,7 @@ void init(void) | |||
295 | screen_access_init(); | 295 | screen_access_init(); |
296 | gui_syncstatusbar_init(&statusbars); | 296 | gui_syncstatusbar_init(&statusbars); |
297 | 297 | ||
298 | #if defined(HAVE_CHARGING) && (CONFIG_CPU == SH7034) | 298 | #if defined(CONFIG_CHARGING) && (CONFIG_CPU == SH7034) |
299 | if (coldstart && charger_inserted() | 299 | if (coldstart && charger_inserted() |
300 | && !global_settings.car_adapter_mode | 300 | && !global_settings.car_adapter_mode |
301 | #ifdef ATA_POWER_PLAYERSTYLE | 301 | #ifdef ATA_POWER_PLAYERSTYLE |
@@ -433,7 +433,7 @@ void init(void) | |||
433 | } | 433 | } |
434 | #endif /* #ifdef AUTOROCK */ | 434 | #endif /* #ifdef AUTOROCK */ |
435 | 435 | ||
436 | #ifdef HAVE_CHARGING | 436 | #ifdef CONFIG_CHARGING |
437 | car_adapter_mode_init(); | 437 | car_adapter_mode_init(); |
438 | #endif | 438 | #endif |
439 | } | 439 | } |