diff options
author | Brandon Low <lostlogic@rockbox.org> | 2006-01-19 15:22:06 +0000 |
---|---|---|
committer | Brandon Low <lostlogic@rockbox.org> | 2006-01-19 15:22:06 +0000 |
commit | f3d13f99059a3b47f85729b6c0909e1d76d6bb7b (patch) | |
tree | 971f0740520dd7bd5f631b33325c078d1e1bc19d /apps/gui/gwps-common.c | |
parent | 127c3febc130c4f35ed7e66601a7a59a78fa97a9 (diff) | |
download | rockbox-f3d13f99059a3b47f85729b6c0909e1d76d6bb7b.tar.gz rockbox-f3d13f99059a3b47f85729b6c0909e1d76d6bb7b.zip |
Make sure that no targets lose charging related features from those red builds yesterday.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8389 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/gwps-common.c')
-rw-r--r-- | apps/gui/gwps-common.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index b2d06bc61f..c9d093963e 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c | |||
@@ -653,15 +653,17 @@ static char* get_tag(struct wps_data* wps_data, | |||
653 | return buf; | 653 | return buf; |
654 | } | 654 | } |
655 | 655 | ||
656 | case 'p': /* External power plugged in? */ | ||
657 | { | ||
656 | #ifdef HAVE_CHARGING | 658 | #ifdef HAVE_CHARGING |
657 | case 'p': /* External power plugged in? */ | 659 | if(charger_input_state==CHARGER) |
658 | { | 660 | #else |
659 | if(charger_input_state==CHARGER) | 661 | if(charger_inserted()) |
660 | return "p"; | ||
661 | else | ||
662 | return NULL; | ||
663 | } | ||
664 | #endif | 662 | #endif |
663 | return "p"; | ||
664 | else | ||
665 | return NULL; | ||
666 | } | ||
665 | #if defined(HAVE_CHARGE_CTRL) || \ | 667 | #if defined(HAVE_CHARGE_CTRL) || \ |
666 | defined (HAVE_CHARGE_STATE) || \ | 668 | defined (HAVE_CHARGE_STATE) || \ |
667 | CONFIG_BATTERY == BATT_LIION2200 | 669 | CONFIG_BATTERY == BATT_LIION2200 |