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

1 files changed, 3 insertions, 3 deletions

diff --git a/apps/plugin.c b/apps/plugin.c
index 1b1c406af4..1bc4817ecd 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -58,7 +58,7 @@
 #include "dsp.h"
 #endif
 
-#ifdef HAVE_CHARGING
+#ifdef CONFIG_CHARGING
 #include "power.h"
 #endif
 
@@ -359,9 +359,9 @@ static const struct plugin_api rockbox_api = {
 #ifndef SIMULATOR
     battery_voltage,
 #endif
-#ifdef HAVE_CHARGING
+#ifdef CONFIG_CHARGING
     charger_inserted,
-# ifdef HAVE_CHARGE_STATE
+# if CONFIG_CHARGING == CHARGING_MONITOR
     charging_state,
 # endif
 #endif