Skip to content

Commit

Permalink
power_supply: Support serial number in olpc_battery
Browse files Browse the repository at this point in the history
This adds serial number support to the OLPC battery driver.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
  • Loading branch information
David Woodhouse authored and Anton Vorontsov committed May 4, 2008
1 parent afa26be commit 1ca5b9d
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions drivers/power/olpc_battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ static struct power_supply olpc_ac = {
.get_property = olpc_ac_get_prop,
};

static char bat_serial[17]; /* Ick */

/*********************************************************************
* Battery properties
*********************************************************************/
Expand All @@ -94,6 +96,7 @@ static int olpc_bat_get_property(struct power_supply *psy,
int ret = 0;
int16_t ec_word;
uint8_t ec_byte;
uint64_t ser_buf;

ret = olpc_ec_cmd(EC_BAT_STATUS, NULL, 0, &ec_byte, 1);
if (ret)
Expand Down Expand Up @@ -241,6 +244,14 @@ static int olpc_bat_get_property(struct power_supply *psy,
ec_word = be16_to_cpu(ec_word);
val->intval = ec_word * 100 / 256;
break;
case POWER_SUPPLY_PROP_SERIAL_NUMBER:
ret = olpc_ec_cmd(EC_BAT_SERIAL, NULL, 0, (void *)&ser_buf, 8);
if (ret)
return ret;

sprintf(bat_serial, "%016llx", (long long)be64_to_cpu(ser_buf));
val->strval = bat_serial;
break;
default:
ret = -EINVAL;
break;
Expand All @@ -260,6 +271,7 @@ static enum power_supply_property olpc_bat_props[] = {
POWER_SUPPLY_PROP_TEMP,
POWER_SUPPLY_PROP_TEMP_AMBIENT,
POWER_SUPPLY_PROP_MANUFACTURER,
POWER_SUPPLY_PROP_SERIAL_NUMBER,
};

/*********************************************************************
Expand Down

0 comments on commit 1ca5b9d

Please sign in to comment.