devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Revert r26055 since it breaks certain Archos targets.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26067 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2010-05-15 21:27:22 +00:00
parent b6c3bc1cc9
commit 964dcb33b6
3 changed files with 1 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/misc.c
View file

@ -264,11 +264,7 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter)
scrobbler_poweroff(); scrobbler_poweroff();
#if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
#if CONFIG_CHARGING >= CHARGING_MONITOR
if(!charging_state())
#else
if(!charger_inserted()) if(!charger_inserted())
#endif
#endif #endif
{ {
bool batt_safe = battery_level_safe(); bool batt_safe = battery_level_safe();
@ -410,11 +406,7 @@ bool list_stop_handler(void)
if (TIME_BEFORE(current_tick, last_off + HZ/2)) if (TIME_BEFORE(current_tick, last_off + HZ/2))
{ {
#if CONFIG_CHARGING >= CHARGING_MONITOR
if (charging_state())
#else
if (charger_inserted()) if (charger_inserted())
#endif
{ {
charging_splash(); charging_splash();
ret = true; /* screen is dirty, caller needs to refresh */ ret = true; /* screen is dirty, caller needs to refresh */

4
firmware/drivers/button.c
View file

@ -205,11 +205,7 @@ static void button_tick(void)
#endif #endif
) && ) &&
#if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
#if CONFIG_CHARGING >= CHARGING_MONITOR
!charging_state() &&
#else
!charger_inserted() && !charger_inserted() &&
#endif
#endif #endif
repeat_count > POWEROFF_COUNT) repeat_count > POWEROFF_COUNT)
{ {

4
firmware/powermgmt.c
View file

@ -358,11 +358,7 @@ static void handle_auto_poweroff(void)
if (usb_inserted() if (usb_inserted()
#if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
#if CONFIG_CHARGING >= CHARGING_MONITOR
|| charging_state()
#else
|| charger_input_state != NO_CHARGER || charger_input_state != NO_CHARGER
#endif
#endif #endif
) { ) {
DEBUGF("Sleep timer timeout. Stopping...\n"); DEBUGF("Sleep timer timeout. Stopping...\n");