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

Make sure that no targets lose charging related features from those red builds yesterday.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8389 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Brandon Low 2006-01-19 15:22:06 +00:00
parent 127c3febc1
commit f3d13f9905
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apps/gui/gwps-common.c
View file

@ -653,15 +653,17 @@ static char* get_tag(struct wps_data* wps_data,
return buf;
}
case 'p': /* External power plugged in? */
{
#ifdef HAVE_CHARGING
case 'p': /* External power plugged in? */
{
if(charger_input_state==CHARGER)
return "p";
else
return NULL;
}
if(charger_input_state==CHARGER)
#else
if(charger_inserted())
#endif
return "p";
else
return NULL;
}
#if defined(HAVE_CHARGE_CTRL) || \
defined (HAVE_CHARGE_STATE) || \
CONFIG_BATTERY == BATT_LIION2200

2
apps/gui/statusbar.c
View file

@ -129,6 +129,8 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
bar->info.volume = sound_val2phys(SOUND_VOLUME, global_settings.volume);
#ifdef HAVE_CHARGING
bar->info.inserted = (charger_input_state == CHARGER);
#else
bar->info.inserted = charger_inserted();
#endif
bar->info.battlevel = battery_level();
bar->info.battery_safe = battery_level_safe();