From 0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Tue, 6 Jun 2006 22:23:52 +0000 Subject: 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 --- firmware/export/power.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'firmware/export/power.h') 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 -- cgit