len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-17 17:12:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Start cleaning up some #ifdefs in charging code

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8391 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Brandon Low 2006-01-19 19:39:51 +00:00
parent 61cd604369
commit a452c7410d
4 changed files with 9 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/debug_menu.c
View file

@ -1333,11 +1333,13 @@ static bool view_runtime(void)
#endif #endif
if (state & 1) { if (state & 1) {
#ifdef HAVE_CHARGING
if (charger_inserted()) if (charger_inserted())
{ {
global_settings.runtime = 0; global_settings.runtime = 0;
} }
else else
#endif
{ {
global_settings.runtime += ((current_tick - lasttime) / HZ); global_settings.runtime += ((current_tick - lasttime) / HZ);
} }

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

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

2
apps/gui/statusbar.c
View file

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

15
firmware/drivers/power.c
View file

@ -104,33 +104,26 @@ void power_init(void)
#endif #endif
} }
#ifdef HAVE_CHARGING
bool charger_inserted(void) bool charger_inserted(void)
{ {
#if CONFIG_CPU == MCF5249 #if CONFIG_CPU == MCF5249
return (GPIO1_READ & 0x00400000)?true:false; return (GPIO1_READ & 0x00400000)?true:false;
#elif defined(GMINI_ARCH) #elif defined(GMINI_ARCH)
return (P7 & 0x80) == 0; return (P7 & 0x80) == 0;
#else #elif defined(HAVE_CHARGE_CTRL)
#ifdef HAVE_CHARGING
#ifdef HAVE_CHARGE_CTRL
/* Recorder */ /* Recorder */
return adc_read(ADC_EXT_POWER) > 0x100; return adc_read(ADC_EXT_POWER) > 0x100;
#else #elif defined (HAVE_FMADC)
#ifdef HAVE_FMADC
/* FM or V2, can also charge from the USB port */ /* FM or V2, can also charge from the USB port */
return (adc_read(ADC_CHARGE_REGULATOR) < 0x1FF) || return (adc_read(ADC_CHARGE_REGULATOR) < 0x1FF) ||
(adc_read(ADC_USB_POWER) < 0x1FF); (adc_read(ADC_USB_POWER) < 0x1FF);
#else #else
/* Player */ /* Player */
return (PADR & 1) == 0; return (PADR & 1) == 0;
#endif /* HAVE_FMADC */
#endif /* HAVE_CHARGE_CTRL */
#else
/* Ondio */
return false;
#endif /* HAVE_CHARGING */
#endif #endif
} }
#endif /* HAVE_CHARGING */
#ifdef HAVE_CHARGE_CTRL #ifdef HAVE_CHARGE_CTRL
void charger_enable(bool on) void charger_enable(bool on)