diff options
author | Daisuke Nojiri <dnojiri@chromium.org> | 2019-04-30 10:08:45 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-05-01 11:03:00 -0700 |
commit | 70a785ad2ab3b1f855d0eddf6366a10d71c5f77c (patch) | |
tree | 41676c263fa00e40724829914502e54699febe42 /driver/battery | |
parent | 15bd8639ef6df248b4474808bd21d80b0c19bac4 (diff) | |
download | chrome-ec-70a785ad2ab3b1f855d0eddf6366a10d71c5f77c.tar.gz |
battery: Consolidate battery_manufacturer_name
Currently, the battery_manufacturer_name API is implemented individually
by each chip.
This patch consolidate the definitions. It also allows a board to
return custom manufacturer names.
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
BUG=b/129599895
BRANCH=none
TEST=buildall
Change-Id: Ib0f60c9be71fea31658ab284a915d73341b9145e
Reviewed-on: https://chromium-review.googlesource.com/1590039
Commit-Ready: YH Lin <yueherngl@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: YH Lin <yueherngl@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'driver/battery')
-rw-r--r-- | driver/battery/bq27541.c | 7 | ||||
-rw-r--r-- | driver/battery/bq27621_g1.c | 5 | ||||
-rw-r--r-- | driver/battery/max17055.c | 7 | ||||
-rw-r--r-- | driver/battery/mm8013.c | 7 | ||||
-rw-r--r-- | driver/battery/smart.c | 3 |
5 files changed, 1 insertions, 28 deletions
diff --git a/driver/battery/bq27541.c b/driver/battery/bq27541.c index 2731b908bf..392c74a05c 100644 --- a/driver/battery/bq27541.c +++ b/driver/battery/bq27541.c @@ -155,13 +155,6 @@ int battery_time_at_rate(int rate, int *minutes) return bq27541_read(REG_AT_RATE_TIME_TO_EMPTY, minutes); } -int battery_manufacturer_name(char *dest, int size) -{ - strzcpy(dest, "<unkn>", size); - - return EC_SUCCESS; -} - int battery_device_chemistry(char *dest, int size) { strzcpy(dest, "<unkn>", size); diff --git a/driver/battery/bq27621_g1.c b/driver/battery/bq27621_g1.c index c55d452c87..304fe67241 100644 --- a/driver/battery/bq27621_g1.c +++ b/driver/battery/bq27621_g1.c @@ -474,11 +474,6 @@ int battery_time_at_rate(int rate, int *minutes) return EC_ERROR_UNIMPLEMENTED; } -int battery_manufacturer_name(char *dest, int size) -{ - return EC_ERROR_UNIMPLEMENTED; -} - int battery_device_chemistry(char *dest, int size) { uint32_t rv; diff --git a/driver/battery/max17055.c b/driver/battery/max17055.c index e549dcec3c..b022b24655 100644 --- a/driver/battery/max17055.c +++ b/driver/battery/max17055.c @@ -174,13 +174,6 @@ int battery_time_at_rate(int rate, int *minutes) return EC_ERROR_UNIMPLEMENTED; } -int battery_manufacturer_name(char *dest, int size) -{ - strzcpy(dest, "<unkn>", size); - - return EC_SUCCESS; -} - int battery_device_chemistry(char *dest, int size) { strzcpy(dest, "<unkn>", size); diff --git a/driver/battery/mm8013.c b/driver/battery/mm8013.c index c445bc42c6..012f3a25bd 100644 --- a/driver/battery/mm8013.c +++ b/driver/battery/mm8013.c @@ -116,13 +116,6 @@ int battery_time_at_rate(int rate, int *minutes) return EC_ERROR_UNIMPLEMENTED; } -int battery_manufacturer_name(char *dest, int size) -{ - strzcpy(dest, "<unkn>", size); - - return EC_SUCCESS; -} - int battery_device_chemistry(char *dest, int size) { strzcpy(dest, "<unkn>", size); diff --git a/driver/battery/smart.c b/driver/battery/smart.c index f06da84e9f..8138aada53 100644 --- a/driver/battery/smart.c +++ b/driver/battery/smart.c @@ -280,8 +280,7 @@ test_mockable int battery_manufacture_date(int *year, int *month, int *day) return EC_SUCCESS; } -/* Read manufacturer name */ -test_mockable int battery_manufacturer_name(char *dest, int size) +int get_battery_manufacturer_name(char *dest, int size) { return sb_read_string(SB_MANUFACTURER_NAME, dest, size); } |