diff options
author | Sam Hurst <shurst@google.com> | 2017-02-01 09:20:22 -0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2017-02-06 14:50:32 -0800 |
commit | edf46467b9519478885375b393fadcdbdd90dde4 (patch) | |
tree | ea18c2e91481fb255352dd2a89e56b848cf4c6a5 /include | |
parent | 2e0df8b6c66c2150dbac853a1abe67d41e46acf9 (diff) | |
download | chrome-ec-edf46467b9519478885375b393fadcdbdd90dde4.tar.gz |
cleanup: Remove charge_state_v1
All boards have been transitioned to charge_state_v2.c
So charge_state_v1.c, HOOK_CHARGE_STATE_CHANGE, and
CONFIG_CHARGER_TIMEOUT_HOURS can be removed
BUG=chrome-os-partner:36272
TEST=make -j buildall
BRANCH=none
Change-Id: I3f20c5198ea75185f9894deb792575a1be31432a
Reviewed-on: https://chromium-review.googlesource.com/435467
Commit-Ready: Sam Hurst <shurst@google.com>
Tested-by: Sam Hurst <shurst@google.com>
Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/charge_state.h | 12 | ||||
-rw-r--r-- | include/config.h | 24 | ||||
-rw-r--r-- | include/hooks.h | 7 | ||||
-rw-r--r-- | include/link_defs.h | 2 |
4 files changed, 6 insertions, 39 deletions
diff --git a/include/charge_state.h b/include/charge_state.h index a1e476209d..63c2df136e 100644 --- a/include/charge_state.h +++ b/include/charge_state.h @@ -120,17 +120,9 @@ int charge_get_battery_temp(int idx, int *temp_ptr); const struct batt_params *charger_current_battery_params(void); -/* Pick the right implementation */ -#ifdef CONFIG_CHARGER_V1 -#ifdef CONFIG_CHARGER_V2 -#error "Choose either CONFIG_CHARGER_V1 or CONFIG_CHARGER_V2, not both" -#else -#include "charge_state_v1.h" -#endif -#else /* not V1 */ +/* Config Charger */ #ifdef CONFIG_CHARGER_V2 #include "charge_state_v2.h" -#endif -#endif /* CONFIG_CHARGER_V1 */ +#endif /* CONFIG_CHARGER_V2 */ #endif /* __CROS_EC_CHARGE_STATE_H */ diff --git a/include/config.h b/include/config.h index 3471b02755..49415d8b28 100644 --- a/include/config.h +++ b/include/config.h @@ -188,14 +188,6 @@ /* Compile mock battery support; used by tests. */ #undef CONFIG_BATTERY_MOCK -/* - * Charger should call battery_override_params() to limit/correct the voltage - * and current requested by the battery pack before acting on the request. - * - * This is valid with CONFIG_CHARGER_V1 only. - */ -#undef CONFIG_BATTERY_OVERRIDE_PARAMS - /* Maximum time to wake a non-responsive battery, in second */ #define CONFIG_BATTERY_PRECHARGE_TIMEOUT 30 @@ -386,7 +378,6 @@ /* Compile common charge state code. You must pick an implementation. */ #undef CONFIG_CHARGER -#undef CONFIG_CHARGER_V1 #undef CONFIG_CHARGER_V2 /* Compile charger-specific code for these chargers (pick at most one) */ @@ -519,8 +510,10 @@ #undef CONFIG_CHARGER_LIMIT_POWER_THRESH_CHG_MW /* - * Equivalent of CONFIG_BATTERY_OVERRIDE_PARAMS for use with - * CONFIG_CHARGER_V2 + * Charger should call battery_override_params() to limit/correct the voltage + * and current requested by the battery pack before acting on the request. + * + * This is valid with CONFIG_CHARGER_V2 only. */ #undef CONFIG_CHARGER_PROFILE_OVERRIDE @@ -537,15 +530,6 @@ #undef CONFIG_CHARGER_SENSE_RESISTOR_AC /* - * Maximum time to charge the battery, in hours. - * - * If this timeout is reached, the charger will enter force-idle state. - * If not defined, charger will provide current until the battery asks it to - * stop. - */ -#undef CONFIG_CHARGER_TIMEOUT_HOURS - -/* * Board has an GPIO pin to enable or disable charging. * * This GPIO should be named GPIO_CHARGER_EN, if active high. Or diff --git a/include/hooks.h b/include/hooks.h index 1c6f5fe274..9df5676e77 100644 --- a/include/hooks.h +++ b/include/hooks.h @@ -154,13 +154,6 @@ enum hook_type { HOOK_POWER_BUTTON_CHANGE, /* - * Charge state machine status changed. - * - * Hook routines are called from the charger task. - */ - HOOK_CHARGE_STATE_CHANGE, - - /* * Battery state of charge changed * * Hook routines are called from the charger task. diff --git a/include/link_defs.h b/include/link_defs.h index e55da8bd50..1f16399cf7 100644 --- a/include/link_defs.h +++ b/include/link_defs.h @@ -52,8 +52,6 @@ extern const struct hook_data __hooks_tablet_mode_change[]; extern const struct hook_data __hooks_tablet_mode_change_end[]; extern const struct hook_data __hooks_pwrbtn_change[]; extern const struct hook_data __hooks_pwrbtn_change_end[]; -extern const struct hook_data __hooks_charge_state_change[]; -extern const struct hook_data __hooks_charge_state_change_end[]; extern const struct hook_data __hooks_battery_soc_change[]; extern const struct hook_data __hooks_battery_soc_change_end[]; extern const struct hook_data __hooks_tick[]; |