Battery: Move battery code to battery_v1.c and v2.c

BUG=b:198722643, b:203031618
BRANCH=None
TEST=buildall

Change-Id: I595da56412f4d30684b00d1138f7e2339c7f5204
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3227372
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>

1 files changed, 0 insertions, 154 deletions

diff --git a/common/battery.c b/common/battery.c
index 6791e4d3a2..6339573d2e 100644
--- a/common/battery.c
+++ b/common/battery.c
@@ -29,15 +29,6 @@
 const static int batt_host_full_factor = CONFIG_BATT_HOST_FULL_FACTOR;
 const static int batt_host_shutdown_pct = CONFIG_BATT_HOST_SHUTDOWN_PERCENTAGE;
 
-#ifdef CONFIG_BATTERY_V2
-/*
- * Store battery information in these 2 structures. Main (lid) battery is always
- * at index 0, and secondary (base) battery at index 1.
- */
-struct ec_response_battery_static_info_v1 battery_static[CONFIG_BATTERY_COUNT];
-struct ec_response_battery_dynamic_info battery_dynamic[CONFIG_BATTERY_COUNT];
-#endif
-
 #ifdef CONFIG_BATTERY_CUT_OFF
 
 #ifndef CONFIG_BATTERY_CUTOFF_DELAY_US
@@ -469,151 +460,6 @@ DECLARE_HOST_COMMAND(EC_CMD_BATTERY_VENDOR_PARAM,
 		     EC_VER_MASK(0));
 #endif /* CONFIG_BATTERY_VENDOR_PARAM */
 
-#ifdef CONFIG_BATTERY_V2
-#ifdef CONFIG_HOSTCMD_BATTERY_V2
-static void battery_update(enum battery_index i);
-static enum ec_status
-host_command_battery_get_static(struct host_cmd_handler_args *args)
-{
-	const struct ec_params_battery_static_info *p = args->params;
-	struct ec_response_battery_static_info_v1 *bat;
-
-	if (p->index < 0 || p->index >= CONFIG_BATTERY_COUNT)
-		return EC_RES_INVALID_PARAM;
-	bat = &battery_static[p->index];
-
-	battery_update(p->index);
-	if (args->version == 0) {
-		struct ec_response_battery_static_info *r = args->response;
-
-		args->response_size = sizeof(*r);
-		r->design_capacity = bat->design_capacity;
-		r->design_voltage = bat->design_voltage;
-		r->cycle_count = bat->cycle_count;
-
-		/* Truncate strings to reduced v0 size */
-		memcpy(&r->manufacturer, &bat->manufacturer_ext,
-		       sizeof(r->manufacturer));
-		r->manufacturer[sizeof(r->manufacturer) - 1] = 0;
-		memcpy(&r->model, &bat->model_ext, sizeof(r->model));
-		r->model[sizeof(r->model) - 1] = 0;
-		memcpy(&r->serial, &bat->serial_ext, sizeof(r->serial));
-		r->serial[sizeof(r->serial) - 1] = 0;
-		memcpy(&r->type, &bat->type_ext, sizeof(r->type));
-		r->type[sizeof(r->type) - 1] = 0;
-	} else {
-		/* v1 command stores the same data internally */
-		struct ec_response_battery_static_info_v1 *r = args->response;
-
-		args->response_size = sizeof(*r);
-		memcpy(r, bat, sizeof(*r));
-	}
-
-	return EC_RES_SUCCESS;
-}
-DECLARE_HOST_COMMAND(EC_CMD_BATTERY_GET_STATIC,
-		     host_command_battery_get_static,
-		     EC_VER_MASK(0) | EC_VER_MASK(1));
-
-static enum ec_status
-host_command_battery_get_dynamic(struct host_cmd_handler_args *args)
-{
-	const struct ec_params_battery_dynamic_info *p = args->params;
-	struct ec_response_battery_dynamic_info *r = args->response;
-
-	if (p->index < 0 || p->index >= CONFIG_BATTERY_COUNT)
-		return EC_RES_INVALID_PARAM;
-
-	args->response_size = sizeof(*r);
-	memcpy(r, &battery_dynamic[p->index], sizeof(*r));
-
-	return EC_RES_SUCCESS;
-}
-DECLARE_HOST_COMMAND(EC_CMD_BATTERY_GET_DYNAMIC,
-		     host_command_battery_get_dynamic,
-		     EC_VER_MASK(0));
-#endif /* CONFIG_HOSTCMD_BATTERY_V2 */
-
-#ifdef HAS_TASK_HOSTCMD
-static void battery_update(enum battery_index i)
-{
-	char *batt_str;
-	int *memmap_dcap = (int *)host_get_memmap(EC_MEMMAP_BATT_DCAP);
-	int *memmap_dvlt = (int *)host_get_memmap(EC_MEMMAP_BATT_DVLT);
-	int *memmap_ccnt = (int *)host_get_memmap(EC_MEMMAP_BATT_CCNT);
-	int *memmap_volt = (int *)host_get_memmap(EC_MEMMAP_BATT_VOLT);
-	int *memmap_rate = (int *)host_get_memmap(EC_MEMMAP_BATT_RATE);
-	int *memmap_cap = (int *)host_get_memmap(EC_MEMMAP_BATT_CAP);
-	int *memmap_lfcc = (int *)host_get_memmap(EC_MEMMAP_BATT_LFCC);
-	uint8_t *memmap_flags = host_get_memmap(EC_MEMMAP_BATT_FLAG);
-
-	/* Smart battery serial number is 16 bits */
-	batt_str = (char *)host_get_memmap(EC_MEMMAP_BATT_SERIAL);
-	memcpy(batt_str, battery_static[i].serial_ext, EC_MEMMAP_TEXT_MAX);
-	batt_str[EC_MEMMAP_TEXT_MAX - 1] = 0;
-
-	/* Design Capacity of Full */
-	*memmap_dcap = battery_static[i].design_capacity;
-
-	/* Design Voltage */
-	*memmap_dvlt = battery_static[i].design_voltage;
-
-	/* Cycle Count */
-	*memmap_ccnt = battery_static[i].cycle_count;
-
-	/* Battery Manufacturer string */
-	batt_str = (char *)host_get_memmap(EC_MEMMAP_BATT_MFGR);
-	memcpy(batt_str, battery_static[i].manufacturer_ext,
-	       EC_MEMMAP_TEXT_MAX);
-	batt_str[EC_MEMMAP_TEXT_MAX - 1] = 0;
-
-	/* Battery Model string */
-	batt_str = (char *)host_get_memmap(EC_MEMMAP_BATT_MODEL);
-	memcpy(batt_str, battery_static[i].model_ext, EC_MEMMAP_TEXT_MAX);
-	batt_str[EC_MEMMAP_TEXT_MAX - 1] = 0;
-
-	/* Battery Type string */
-	batt_str = (char *)host_get_memmap(EC_MEMMAP_BATT_TYPE);
-	memcpy(batt_str, battery_static[i].type_ext, EC_MEMMAP_TEXT_MAX);
-	batt_str[EC_MEMMAP_TEXT_MAX - 1] = 0;
-
-	*memmap_volt = battery_dynamic[i].actual_voltage;
-	*memmap_rate = battery_dynamic[i].actual_current;
-	*memmap_cap = battery_dynamic[i].remaining_capacity;
-	*memmap_lfcc = battery_dynamic[i].full_capacity;
-	*memmap_flags = battery_dynamic[i].flags;
-}
-
-void battery_memmap_refresh(enum battery_index index)
-{
-	if (*host_get_memmap(EC_MEMMAP_BATT_INDEX) == index)
-		battery_update(index);
-}
-
-void battery_memmap_set_index(enum battery_index index)
-{
-	if (*host_get_memmap(EC_MEMMAP_BATT_INDEX) == index)
-		return;
-
-	*host_get_memmap(EC_MEMMAP_BATT_INDEX) = BATT_IDX_INVALID;
-	if (index < 0 || index >= CONFIG_BATTERY_COUNT)
-		return;
-
-	battery_update(index);
-	*host_get_memmap(EC_MEMMAP_BATT_INDEX) = index;
-}
-
-static void battery_init(void)
-{
-	*host_get_memmap(EC_MEMMAP_BATT_INDEX) = BATT_IDX_INVALID;
-	*host_get_memmap(EC_MEMMAP_BATT_COUNT) = CONFIG_BATTERY_COUNT;
-	*host_get_memmap(EC_MEMMAP_BATTERY_VERSION) = 2;
-
-	battery_memmap_set_index(BATT_IDX_MAIN);
-}
-DECLARE_HOOK(HOOK_INIT, battery_init, HOOK_PRIO_DEFAULT);
-#endif /* HAS_TASK_HOSTCMD */
-#endif /* CONFIG_BATTERY_V2 */
 
 void battery_compensate_params(struct batt_params *batt)
 {