Iriver: Sleep timer now powers off the box even when the charger is connected.

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

3 files changed, 7 insertions, 1 deletions

diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h
index 2dea66beca..b97ad90548 100644
--- a/firmware/export/config-h100.h
+++ b/firmware/export/config-h100.h
@@ -39,6 +39,9 @@
 /* Define this if the platform can charge batteries */
 #define HAVE_CHARGING 1
 
+/* define this if the hardware can be powered off while charging */
+#define HAVE_POWEROFF_WHILE_CHARGING
+
 /* The start address index for ROM builds */
 #define ROM_START 0x11010
 
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h
index de54e7740f..92f2cc03eb 100644
--- a/firmware/export/config-h300.h
+++ b/firmware/export/config-h300.h
@@ -39,6 +39,9 @@
 /* Define this if the platform can charge batteries */
 #define HAVE_CHARGING 1
 
+/* define this if the hardware can be powered off while charging */
+#define HAVE_POWEROFF_WHILE_CHARGING
+
 /* The start address index for ROM builds */
 #define ROM_START 0x11010
 
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 2d7e5dfe6e..37bbbe2e2c 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -399,7 +399,7 @@ static void handle_auto_poweroff(void)
             if(TIME_AFTER(current_tick, sleeptimer_endtick))
             {
                 audio_stop();
-#ifdef HAVE_CHARGING
+#if defined(HAVE_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING)
                 if((charger_input_state == CHARGER) ||
                    (charger_input_state == CHARGER_PLUGGED))
                 {