Index: firmware/drivers/power.c =================================================================== RCS file: /cvsroot/rockbox/firmware/drivers/power.c,v retrieving revision 1.12 diff -u -r1.12 power.c --- firmware/drivers/power.c 21 Jan 2003 19:37:29 -0000 1.12 +++ firmware/drivers/power.c 13 Feb 2003 20:24:27 -0000 @@ -32,13 +32,16 @@ bool charger_inserted(void) { #ifdef HAVE_CHARGE_CTRL -#ifdef HAVE_FMADC - return adc_read(ADC_CHARGE_REGULATOR) < 0x1FF; -#else + /* Recorder */ return adc_read(ADC_EXT_POWER) > 0x100; -#endif #else +# ifdef HAVE_FMADC + /* FM */ + return adc_read(ADC_CHARGE_REGULATOR) < 0x1FF; +# else + /* Player */ return (PADR & 1) == 0; +# endif #endif } Index: apps/status.c =================================================================== RCS file: /cvsroot/rockbox/apps/status.c,v retrieving revision 1.38 diff -u -r1.38 status.c --- apps/status.c 27 Jan 2003 14:24:39 -0000 1.38 +++ apps/status.c 13 Feb 2003 20:24:32 -0000 @@ -229,7 +229,11 @@ if (battery_state) statusbar_icon_battery(battlevel, plug_state); #else +# ifdef HAVE_FMADC + statusbar_icon_battery(battlevel, charger_inserted()); +# else statusbar_icon_battery(battlevel, false); +# endif #endif statusbar_icon_volume(volume); statusbar_icon_play_state(current_mode + Icon_Play);