From 964dcb33b6b55347ee6ad4020bd00843fbcd2a1d Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sat, 15 May 2010 21:27:22 +0000 Subject: Revert r26055 since it breaks certain Archos targets. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26067 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/button.c | 4 ---- firmware/powermgmt.c | 4 ---- 2 files changed, 8 deletions(-) (limited to 'firmware') diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index f116ad646e..91b8ebd0c3 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c @@ -205,11 +205,7 @@ static void button_tick(void) #endif ) && #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) -#if CONFIG_CHARGING >= CHARGING_MONITOR - !charging_state() && -#else !charger_inserted() && -#endif #endif repeat_count > POWEROFF_COUNT) { diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index bf5734c264..f1dd83ef52 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c @@ -358,11 +358,7 @@ static void handle_auto_poweroff(void) if (usb_inserted() #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) -#if CONFIG_CHARGING >= CHARGING_MONITOR - || charging_state() -#else || charger_input_state != NO_CHARGER -#endif #endif ) { DEBUGF("Sleep timer timeout. Stopping...\n"); -- cgit v1.2.3