1. Updated battery_bench plugin:

1.1 Don't use the plugin_get_buffer() so the playlist viewer should work with this plugin running;
1.2 Added new columns for charger inserted, charging, usb powered;
1.3 Some other small improvements
2. charger_inserted() again returns only the AC/DC charger state on H3x0, doesn't include the usb state;
3. Some ifdefs corrected in power.c and power.h;


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8607 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 15 insertions, 4 deletions

diff --git a/firmware/export/power.h b/firmware/export/power.h
index 9f91e25f15..be8ebda5b0 100644
--- a/firmware/export/power.h
+++ b/firmware/export/power.h
@@ -21,15 +21,26 @@
 
 #ifdef HAVE_CHARGE_CTRL
 extern bool charger_enabled;
+void charger_enable(bool on);
 #endif
 
-void power_init(void);
+#ifdef HAVE_CHARGING
 bool charger_inserted(void);
-bool charging_state(void);
-void charger_enable(bool on);
+#endif
+
+void power_off(void);
 void ide_power_enable(bool on);
+
+#ifndef SIMULATOR
+
+void power_init(void);
+
+# ifdef HAVE_CHARGE_STATE
+bool charging_state(void);
+# endif
+
 bool ide_powered(void);
-void power_off(void);
+#endif
 
 #ifdef HAVE_SPDIF_POWER
 void spdif_power_enable(bool on);