diff options
| author | Uwe Freese <thebreaker@rockbox.org> | 2003-02-13 21:45:19 +0000 |
|---|---|---|
| committer | Uwe Freese <thebreaker@rockbox.org> | 2003-02-13 21:45:19 +0000 |
| commit | cc9b62f6b2814cc29b104f9a7b5635cbeb104cc0 (patch) | |
| tree | 8b4997cfe0df577b6266c843c8de7e5ba54e5312 | |
| parent | 4c5090f4a22d501b8d84488bd654593c3d9762ba (diff) | |
| download | rockbox-cc9b62f6b2814cc29b104f9a7b5635cbeb104cc0.zip rockbox-cc9b62f6b2814cc29b104f9a7b5635cbeb104cc0.tar.gz rockbox-cc9b62f6b2814cc29b104f9a7b5635cbeb104cc0.tar.bz2 rockbox-cc9b62f6b2814cc29b104f9a7b5635cbeb104cc0.tar.xz | |
Mike Holden's patch that corrects the FM charger plugged symbol
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3251 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/status.c | 8 | ||||
| -rw-r--r-- | firmware/drivers/power.c | 11 |
2 files changed, 13 insertions, 6 deletions
diff --git a/apps/status.c b/apps/status.c index 8ebf662..5d4bba6 100644 --- a/apps/status.c +++ b/apps/status.c @@ -200,7 +200,7 @@ void status_draw(void) #ifdef HAVE_LCD_BITMAP if (global_settings.statusbar) { statusbar_wipe(); -#ifdef HAVE_CHARGE_CTRL +#ifdef HAVE_CHARGE_CTRL /* Recorder */ if(charger_inserted()) { battery_state = true; plug_state = true; @@ -229,8 +229,12 @@ void status_draw(void) if (battery_state) statusbar_icon_battery(battlevel, plug_state); #else +#ifdef HAVE_FMADC /* FM */ + statusbar_icon_battery(battlevel, charger_inserted()); +#else /* Player */ statusbar_icon_battery(battlevel, false); -#endif +#endif /* HAVE_FMADC */ +#endif /* HAVE_CHARGE_CTRL */ statusbar_icon_volume(volume); statusbar_icon_play_state(current_mode + Icon_Play); switch (global_settings.repeat_mode) { diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c index 4d8b1ca..d360506 100644 --- a/firmware/drivers/power.c +++ b/firmware/drivers/power.c @@ -32,14 +32,17 @@ bool charger_enabled = 0; bool charger_inserted(void) { #ifdef HAVE_CHARGE_CTRL + /* Recorder */ + return adc_read(ADC_EXT_POWER) > 0x100; +#else #ifdef HAVE_FMADC + /* FM */ return adc_read(ADC_CHARGE_REGULATOR) < 0x1FF; #else - return adc_read(ADC_EXT_POWER) > 0x100; -#endif -#else + /* Player */ return (PADR & 1) == 0; -#endif +#endif /* HAVE_FMADC */ +#endif /* HAVE_CHARGE_CTRL */ } void charger_enable(bool on) |