lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apm_power: improve battery finding algorithm

Browse Source 
Prior to this patch, if use_for_apm unspecified, apm_power able
to choice batteries according to their charge only.

This patch adds ability to choice batteries according to their charge,
energy, use_for_apm flag, and fallback to any battery if it failed to
decide.

Patch is mandatory to report Apple PMU batteries through legacy
/proc/apm interface using power supply class.

Signed-off-by: Anton Vorontsov <cbou@mail.ru>
This commit is contained in:
Anton Vorontsov
2007-10-05 01:05:00 +04:00
parent cd1ebcc0ef
commit d385376f0d
1 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
drivers/power/apm_power.c
View File

@@ -26,28 +26,65 @@ static struct power_supply *main_battery;
static void find_main_battery(void) static void find_main_battery(void)
{ {
struct device *dev; struct device *dev;
struct power_supply *bat, *batm; struct power_supply *bat = NULL;
struct power_supply *max_charge_bat = NULL;
struct power_supply *max_energy_bat = NULL;
union power_supply_propval full; union power_supply_propval full;
int max_charge = 0; int max_charge = 0;
int max_energy = 0;
main_battery = NULL; main_battery = NULL;
batm = NULL;
list_for_each_entry(dev, &power_supply_class->devices, node) { list_for_each_entry(dev, &power_supply_class->devices, node) {
bat = dev_get_drvdata(dev); bat = dev_get_drvdata(dev);
/* If none of battery devices cantains 'use_for_apm' flag,
choice one with maximum design charge */ if (bat->use_for_apm) {
if (!PSY_PROP(bat, CHARGE_FULL_DESIGN, &full)) { /* nice, we explicitly asked to report this battery. */
main_battery = bat;
return;
}
if (!PSY_PROP(bat, CHARGE_FULL_DESIGN, &full) ||
!PSY_PROP(bat, CHARGE_FULL, &full)) {
if (full.intval > max_charge) { if (full.intval > max_charge) {
batm = bat; max_charge_bat = bat;
max_charge = full.intval; max_charge = full.intval;
} }
} else if (!PSY_PROP(bat, ENERGY_FULL_DESIGN, &full) ||
!PSY_PROP(bat, ENERGY_FULL, &full)) {
if (full.intval > max_energy) {
max_energy_bat = bat;
max_energy = full.intval;
}
}
} }
if (bat->use_for_apm) if ((max_energy_bat && max_charge_bat) &&
(max_energy_bat != max_charge_bat)) {
/* try guess battery with more capacity */
if (!PSY_PROP(max_charge_bat, VOLTAGE_MAX_DESIGN, &full)) {
if (max_energy > max_charge * full.intval)
main_battery = max_energy_bat;
else
main_battery = max_charge_bat;
} else if (!PSY_PROP(max_energy_bat, VOLTAGE_MAX_DESIGN,
&full)) {
if (max_charge > max_energy / full.intval)
main_battery = max_charge_bat;
else
main_battery = max_energy_bat;
} else {
/* give up, choice any */
main_battery = max_energy_bat;
}
} else if (max_charge_bat) {
main_battery = max_charge_bat;
} else if (max_energy_bat) {
main_battery = max_energy_bat;
} else {
/* give up, try the last if any */
main_battery = bat; main_battery = bat;
} }
if (!main_battery)
main_battery = batm;
} }
static int calculate_time(int status) static int calculate_time(int status)