Messages in this thread | | | Date | Mon, 14 Oct 2019 07:46:21 +0200 | From | Sebastian Reichel <> | Subject | Re: [PATCH v2 1/2] test_power: Add CHARGE_COUNTER properties |
| |
Hi,
On Fri, Sep 13, 2019 at 02:25:59AM +0800, lecopzer@gmail.com wrote: > CHARGE_COUNTER is really general in other power supply drivers and > Android also has an interface to monitor CHARGE_COUNTER, so let's > add it into test framework. > > Set default as -1000 is because the default status is > POWER_SUPPLY_STATUS_DISCHARGING, which means the counter should be > negative, and 1000 means not zero but small enough. > > Signed-off-by: Lecopzer Chen <lecopzer.chen@mediatek.com> > ---
Thanks, queued.
-- Sebastian
> drivers/power/supply/test_power.c | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/drivers/power/supply/test_power.c b/drivers/power/supply/test_power.c > index c3cad2b6daba..70db8d20e138 100644 > --- a/drivers/power/supply/test_power.c > +++ b/drivers/power/supply/test_power.c > @@ -33,6 +33,7 @@ static int battery_present = 1; /* true */ > static int battery_technology = POWER_SUPPLY_TECHNOLOGY_LION; > static int battery_capacity = 50; > static int battery_voltage = 3300; > +static int battery_charge_counter = -1000; > > static bool module_initialized; > > @@ -100,6 +101,9 @@ static int test_power_get_battery_property(struct power_supply *psy, > case POWER_SUPPLY_PROP_CHARGE_NOW: > val->intval = battery_capacity; > break; > + case POWER_SUPPLY_PROP_CHARGE_COUNTER: > + val->intval = battery_charge_counter; > + break; > case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN: > case POWER_SUPPLY_PROP_CHARGE_FULL: > val->intval = 100; > @@ -135,6 +139,7 @@ static enum power_supply_property test_power_battery_props[] = { > POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, > POWER_SUPPLY_PROP_CHARGE_FULL, > POWER_SUPPLY_PROP_CHARGE_NOW, > + POWER_SUPPLY_PROP_CHARGE_COUNTER, > POWER_SUPPLY_PROP_CAPACITY, > POWER_SUPPLY_PROP_CAPACITY_LEVEL, > POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG, > @@ -447,6 +452,21 @@ static int param_set_battery_voltage(const char *key, > > #define param_get_battery_voltage param_get_int > > +static int param_set_battery_charge_counter(const char *key, > + const struct kernel_param *kp) > +{ > + int tmp; > + > + if (1 != sscanf(key, "%d", &tmp)) > + return -EINVAL; > + > + battery_charge_counter = tmp; > + signal_power_supply_changed(test_power_supplies[TEST_BATTERY]); > + return 0; > +} > + > +#define param_get_battery_charge_counter param_get_int > + > static const struct kernel_param_ops param_ops_ac_online = { > .set = param_set_ac_online, > .get = param_get_ac_online, > @@ -487,6 +507,11 @@ static const struct kernel_param_ops param_ops_battery_voltage = { > .get = param_get_battery_voltage, > }; > > +static const struct kernel_param_ops param_ops_battery_charge_counter = { > + .set = param_set_battery_charge_counter, > + .get = param_get_battery_charge_counter, > +}; > + > #define param_check_ac_online(name, p) __param_check(name, p, void); > #define param_check_usb_online(name, p) __param_check(name, p, void); > #define param_check_battery_status(name, p) __param_check(name, p, void); > @@ -495,6 +520,7 @@ static const struct kernel_param_ops param_ops_battery_voltage = { > #define param_check_battery_health(name, p) __param_check(name, p, void); > #define param_check_battery_capacity(name, p) __param_check(name, p, void); > #define param_check_battery_voltage(name, p) __param_check(name, p, void); > +#define param_check_battery_charge_counter(name, p) __param_check(name, p, void); > > > module_param(ac_online, ac_online, 0644); > @@ -525,6 +551,10 @@ MODULE_PARM_DESC(battery_capacity, "battery capacity (percentage)"); > module_param(battery_voltage, battery_voltage, 0644); > MODULE_PARM_DESC(battery_voltage, "battery voltage (millivolts)"); > > +module_param(battery_charge_counter, battery_charge_counter, 0644); > +MODULE_PARM_DESC(battery_charge_counter, > + "battery charge counter (microampere-hours)"); > + > MODULE_DESCRIPTION("Power supply driver for testing"); > MODULE_AUTHOR("Anton Vorontsov <cbouatmailru@gmail.com>"); > MODULE_LICENSE("GPL"); > -- > 2.17.1 > [unhandled content-type:application/pgp-signature] | |