diff options
author | Brandon Low <lostlogic@rockbox.org> | 2006-01-19 19:39:51 +0000 |
---|---|---|
committer | Brandon Low <lostlogic@rockbox.org> | 2006-01-19 19:39:51 +0000 |
commit | a452c7410dcc50cd12ad6d09a639c18b435d7ec9 (patch) | |
tree | a2c603dfe0a9acbc80ff613c2d4ec728dcc1a74f /apps/gui | |
parent | 61cd604369ce3aaa437dd9b91a700a6c4393df89 (diff) | |
download | rockbox-a452c7410dcc50cd12ad6d09a639c18b435d7ec9.tar.gz rockbox-a452c7410dcc50cd12ad6d09a639c18b435d7ec9.zip |
Start cleaning up some #ifdefs in charging code
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8391 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/gwps-common.c | 12 | ||||
-rw-r--r-- | apps/gui/statusbar.c | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index c9d093963e..b9b3e9bcd0 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c | |||
@@ -653,27 +653,21 @@ static char* get_tag(struct wps_data* wps_data, | |||
653 | return buf; | 653 | return buf; |
654 | } | 654 | } |
655 | 655 | ||
656 | #ifdef HAVE_CHARGING | ||
656 | case 'p': /* External power plugged in? */ | 657 | case 'p': /* External power plugged in? */ |
657 | { | 658 | { |
658 | #ifdef HAVE_CHARGING | ||
659 | if(charger_input_state==CHARGER) | 659 | if(charger_input_state==CHARGER) |
660 | #else | ||
661 | if(charger_inserted()) | ||
662 | #endif | ||
663 | return "p"; | 660 | return "p"; |
664 | else | 661 | else |
665 | return NULL; | 662 | return NULL; |
666 | } | 663 | } |
664 | #endif | ||
667 | #if defined(HAVE_CHARGE_CTRL) || \ | 665 | #if defined(HAVE_CHARGE_CTRL) || \ |
668 | defined (HAVE_CHARGE_STATE) || \ | 666 | defined (HAVE_CHARGE_STATE) || \ |
669 | CONFIG_BATTERY == BATT_LIION2200 | 667 | CONFIG_BATTERY == BATT_LIION2200 |
670 | case 'c': /* Charging */ | 668 | case 'c': /* Charging */ |
671 | { | 669 | { |
672 | if (charge_state == CHARGING | 670 | if (charge_state == CHARGING || charge_state == TOPOFF) { |
673 | #ifdef HAVE_CHARGE_CTRL | ||
674 | || charge_state == TOPOFF | ||
675 | #endif | ||
676 | ) { | ||
677 | return "c"; | 671 | return "c"; |
678 | } else { | 672 | } else { |
679 | return NULL; | 673 | return NULL; |
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index 57308c52f2..d8e611af85 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -129,8 +129,6 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | |||
129 | bar->info.volume = sound_val2phys(SOUND_VOLUME, global_settings.volume); | 129 | bar->info.volume = sound_val2phys(SOUND_VOLUME, global_settings.volume); |
130 | #ifdef HAVE_CHARGING | 130 | #ifdef HAVE_CHARGING |
131 | bar->info.inserted = (charger_input_state == CHARGER); | 131 | bar->info.inserted = (charger_input_state == CHARGER); |
132 | #else | ||
133 | bar->info.inserted = charger_inserted(); | ||
134 | #endif | 132 | #endif |
135 | bar->info.battlevel = battery_level(); | 133 | bar->info.battlevel = battery_level(); |
136 | bar->info.battery_safe = battery_level_safe(); | 134 | bar->info.battery_safe = battery_level_safe(); |