summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDossym Nurmukhanov <dossym@google.com>2021-01-09 04:59:31 +0000
committerCommit Bot <commit-bot@chromium.org>2021-01-12 00:58:25 +0000
commitc6061b464c125da2c5c7b2cdd4a3189453d41dea (patch)
treedbd3e27303f4b528e2395005ceb184ec5950a118 /include
parent903439c6a33c43c18d8ec7ac9caa2f7082a36b95 (diff)
downloadchrome-ec-c6061b464c125da2c5c7b2cdd4a3189453d41dea.tar.gz
COIL: Rename EC-EC comm defines to be more inclusive
BUG=none BRANCH=none TEST=Build and run on a device Signed-off-by: dossym@chromium.org Change-Id: I48d1ec4be528ac3c39f81740016f11d7eca3c740 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2619070 Reviewed-by: Nicolas Boichat <drinkcat@chromium.org> Commit-Queue: Nicolas Boichat <drinkcat@chromium.org>
Diffstat (limited to 'include')
-rw-r--r--include/charge_state_v2.h2
-rw-r--r--include/config.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/charge_state_v2.h b/include/charge_state_v2.h
index 518b478b3a..84a4b38b20 100644
--- a/include/charge_state_v2.h
+++ b/include/charge_state_v2.h
@@ -43,7 +43,7 @@ struct charge_state_data {
#ifdef CONFIG_CHARGER_OTG
int output_current;
#endif
-#ifdef CONFIG_EC_EC_COMM_BATTERY_MASTER
+#ifdef CONFIG_EC_EC_COMM_BATTERY_CLIENT
int input_voltage;
#endif
#ifdef CONFIG_OCPC
diff --git a/include/config.h b/include/config.h
index 56e64c1672..4a3b832577 100644
--- a/include/config.h
+++ b/include/config.h
@@ -5396,13 +5396,13 @@
*/
#ifdef CONFIG_EC_EC_COMM_BATTERY
#ifdef CONFIG_EC_EC_COMM_CLIENT
-#define CONFIG_EC_EC_COMM_BATTERY_MASTER
+#define CONFIG_EC_EC_COMM_BATTERY_CLIENT
#define CONFIG_BATTERY_V2
#define CONFIG_BATTERY_COUNT 2
#endif
#ifdef CONFIG_EC_EC_COMM_SERVER
-#define CONFIG_EC_EC_COMM_BATTERY_SLAVE
+#define CONFIG_EC_EC_COMM_BATTERY_SERVER
#define CONFIG_BATTERY_V2
#define CONFIG_BATTERY_COUNT 1
#endif