diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-08-08 16:17:49 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-08-09 11:19:03 -0700 |
| commit | d8be5316e6920c0ef0ef85e3a3859c8a64dc6d51 (patch) | |
| tree | 38a4f08aa700533031f30795e5d7374840d58185 /common | |
| parent | 2b2f78d9295103a8df550086feeaaaa80aa56a2d (diff) | |
| download | chrome-ec-d8be5316e6920c0ef0ef85e3a3859c8a64dc6d51.tar.gz | |
Hide battery vendor params override behind config option
Only link actually used this function, but all batteries were required
to provide an (empty) implementation. Use
CONFIG_BATTERY_VENDOR_PARAMS to gate this functionality, so non-link
battery code can be simpler.
BUG=chrome-os-partner:18343
BRANCH=none
TEST=build all platforms and pass unit tests
Change-Id: Ic2c6dd1163a981e48873d798f77891cc7de1f8cf
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/65257
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Rong Chang <rongchang@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/battery_falco.c | 6 | ||||
| -rw-r--r-- | common/battery_peppy.c | 6 | ||||
| -rw-r--r-- | common/battery_slippy.c | 6 | ||||
| -rw-r--r-- | common/charge_state.c | 2 | ||||
| -rw-r--r-- | common/mock_smart_battery_stub.c | 4 |
5 files changed, 2 insertions, 22 deletions
diff --git a/common/battery_falco.c b/common/battery_falco.c index 9a493c19d6..554e3cf7c2 100644 --- a/common/battery_falco.c +++ b/common/battery_falco.c @@ -36,12 +36,6 @@ const struct battery_info *battery_get_info(void) return &info; } -/* FIXME: The smart battery should do the right thing - that's why it's - * called "smart". Do we really want to second-guess it? For now, let's not. */ -void battery_vendor_params(struct batt_params *batt) -{ -} - int battery_command_cut_off(struct host_cmd_handler_args *args) { int rv; diff --git a/common/battery_peppy.c b/common/battery_peppy.c index 76d2d04395..1bc28c71d0 100644 --- a/common/battery_peppy.c +++ b/common/battery_peppy.c @@ -38,12 +38,6 @@ const struct battery_info *battery_get_info(void) return &info; } -/* FIXME: The smart battery should do the right thing - that's why it's - * called "smart". Do we really want to second-guess it? For now, let's not. */ -void battery_vendor_params(struct batt_params *batt) -{ -} - int battery_command_cut_off(struct host_cmd_handler_args *args) { return sb_write(SB_SHIP_MODE_ADDR, SB_SHIP_MODE_DATA); diff --git a/common/battery_slippy.c b/common/battery_slippy.c index 64d5c09d1e..75a179f291 100644 --- a/common/battery_slippy.c +++ b/common/battery_slippy.c @@ -33,12 +33,6 @@ const struct battery_info *battery_get_info(void) return &info; } -/* FIXME: The smart battery should do the right thing - that's why it's - * called "smart". Do we really want to second-guess it? For now, let's not. */ -void battery_vendor_params(struct batt_params *batt) -{ -} - /** * Physical detection of battery connection. */ diff --git a/common/charge_state.c b/common/charge_state.c index d7a809e735..d0b5971ca9 100644 --- a/common/charge_state.c +++ b/common/charge_state.c @@ -284,8 +284,10 @@ static int state_common(struct power_state_context *ctx) *ctx->memmap_batt_flags &= ~EC_BATT_FLAG_LEVEL_CRITICAL; } +#ifdef CONFIG_BATTERY_VENDOR_PARAMS /* Apply battery pack vendor charging method */ battery_vendor_params(batt); +#endif #ifdef CONFIG_CHARGER_CURRENT_LIMIT if (batt->desired_current > CONFIG_CHARGER_CURRENT_LIMIT) diff --git a/common/mock_smart_battery_stub.c b/common/mock_smart_battery_stub.c index 0cf7b70e78..17287cd7ad 100644 --- a/common/mock_smart_battery_stub.c +++ b/common/mock_smart_battery_stub.c @@ -118,7 +118,3 @@ const struct battery_info *battery_get_info(void) { return &bat_info; } - -void battery_vendor_params(struct batt_params *batt) -{ -} |