summaryrefslogtreecommitdiffstats
path: root/firmware/export/power.h
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2006-06-06 22:23:52 +0000
committerJens Arnold <amiconn@rockbox.org>2006-06-06 22:23:52 +0000
commit0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f (patch)
treee3e77d4e6b25b82c82b3570cd8c4a988c7788e66 /firmware/export/power.h
parent8c9e22580e220b793130ed3ac67b9c54e85b3d0f (diff)
downloadrockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.tar.gz
rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.tar.bz2
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 'firmware/export/power.h')
-rw-r--r--firmware/export/power.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/export/power.h b/firmware/export/power.h
index be8ebda5b0..dc6c09d9f9 100644
--- a/firmware/export/power.h
+++ b/firmware/export/power.h
@@ -19,12 +19,12 @@
#ifndef _POWER_H_
#define _POWER_H_
-#ifdef HAVE_CHARGE_CTRL
+#if CONFIG_CHARGING == CHARGING_CONTROL
extern bool charger_enabled;
void charger_enable(bool on);
#endif
-#ifdef HAVE_CHARGING
+#ifdef CONFIG_CHARGING
bool charger_inserted(void);
#endif
@@ -35,7 +35,7 @@ void ide_power_enable(bool on);
void power_init(void);
-# ifdef HAVE_CHARGE_STATE
+# if CONFIG_CHARGING == CHARGING_MONITOR
bool charging_state(void);
# endif