Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 198154
b: refs/heads/master
c: 0011d2d
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Mack authored and Anton Vorontsov committed May 19, 2010
1 parent bf15f5f commit e33ede0
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5f487cd34f4337f9bc27ca19da72a39d1b0a0ab4
refs/heads/master: 0011d2d4a5f7bb5666dcfb9f9b3dbdb084ab98f1
38 changes: 35 additions & 3 deletions trunk/drivers/power/power_supply_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
{ \
.attr = { .name = #_name }, \
.show = power_supply_show_property, \
.store = NULL, \
.store = power_supply_store_property, \
}

static struct device_attribute power_supply_attrs[];
Expand Down Expand Up @@ -99,6 +99,29 @@ static ssize_t power_supply_show_property(struct device *dev,
return sprintf(buf, "%d\n", value.intval);
}

static ssize_t power_supply_store_property(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count) {
ssize_t ret;
struct power_supply *psy = dev_get_drvdata(dev);
const ptrdiff_t off = attr - power_supply_attrs;
union power_supply_propval value;
long long_val;

/* TODO: support other types than int */
ret = strict_strtol(buf, 10, &long_val);
if (ret < 0)
return ret;

value.intval = long_val;

ret = psy->set_property(psy, off, &value);
if (ret < 0)
return ret;

return count;
}

/* Must be in the same order as POWER_SUPPLY_PROP_* */
static struct device_attribute power_supply_attrs[] = {
/* Properties of type `int' */
Expand Down Expand Up @@ -159,8 +182,17 @@ static mode_t power_supply_attr_is_visible(struct kobject *kobj,
int i;

for (i = 0; i < psy->num_properties; i++) {
if (psy->properties[i] == attrno)
return 0444;
int property = psy->properties[i];

if (property == attrno) {
mode_t mode = S_IRUSR | S_IRGRP | S_IROTH;

if (psy->property_is_writeable &&
psy->property_is_writeable(psy, property) > 0)
mode |= S_IWUSR;

return mode;
}
}

return 0;
Expand Down
5 changes: 5 additions & 0 deletions trunk/include/linux/power_supply.h
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@ struct power_supply {
int (*get_property)(struct power_supply *psy,
enum power_supply_property psp,
union power_supply_propval *val);
int (*set_property)(struct power_supply *psy,
enum power_supply_property psp,
const union power_supply_propval *val);
int (*property_is_writeable)(struct power_supply *psy,
enum power_supply_property psp);
void (*external_power_changed)(struct power_supply *psy);
void (*set_charged)(struct power_supply *psy);

Expand Down

0 comments on commit e33ede0

Please sign in to comment.