ish: Trim down the release branchstabilize-wristpin-14469.59.B-ishstabilize-voshyr-14637.B-ishstabilize-quickfix-14695.187.B-ishstabilize-quickfix-14695.124.B-ishstabilize-quickfix-14526.91.B-ishstabilize-14695.85.B-ishstabilize-14695.107.B-ishstabilize-14682.B-ishstabilize-14633.B-ishstabilize-14616.B-ishstabilize-14589.B-ishstabilize-14588.98.B-ishstabilize-14588.14.B-ishstabilize-14588.123.B-ishstabilize-14536.B-ishstabilize-14532.B-ishstabilize-14528.B-ishstabilize-14526.89.B-ishstabilize-14526.84.B-ishstabilize-14526.73.B-ishstabilize-14526.67.B-ishstabilize-14526.57.B-ishstabilize-14498.B-ishstabilize-14496.B-ishstabilize-14477.B-ishstabilize-14469.9.B-ishstabilize-14469.8.B-ishstabilize-14469.58.B-ishstabilize-14469.41.B-ishstabilize-14442.B-ishstabilize-14438.B-ishstabilize-14411.B-ishstabilize-14396.B-ishstabilize-14395.B-ishstabilize-14388.62.B-ishstabilize-14388.61.B-ishstabilize-14388.52.B-ishstabilize-14385.B-ishstabilize-14345.B-ishstabilize-14336.B-ishstabilize-14333.B-ishrelease-R99-14469.B-ishrelease-R98-14388.B-ishrelease-R102-14695.B-ishrelease-R101-14588.B-ishrelease-R100-14526.B-ishfirmware-cherry-14454.B-ishfirmware-brya-14505.B-ishfirmware-brya-14505.71.B-ishfactory-kukui-14374.B-ishfactory-guybrush-14600.B-ishfactory-cherry-14455.B-ishfactory-brya-14517.B-ish

In the interest of making long-term branch maintenance incur as little
technical debt on us as possible, we should not maintain any files on
the branch we are not actually using.

This has the added effect of making it extremely clear when merging CLs
from the main branch when changes have the possibility to affect us.

The follow-on CL adds a convenience script to actually pull updates from
the main branch and generate a CL for the update.

BUG=b:204206272
BRANCH=ish
TEST=make BOARD=arcada_ish && make BOARD=drallion_ish

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

1 files changed, 0 insertions, 173 deletions

diff --git a/common/temp_sensor.c b/common/temp_sensor.c
deleted file mode 100644
index 69d440a6d5..0000000000
--- a/common/temp_sensor.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Copyright 2012 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* Temperature sensor module for Chrome EC */
-
-#include "common.h"
-#include "console.h"
-#include "hooks.h"
-#include "host_command.h"
-#include "task.h"
-#include "temp_sensor.h"
-#include "thermal.h"
-#include "timer.h"
-#include "util.h"
-
-#ifdef CONFIG_ZEPHYR
-#include "temp_sensor/temp_sensor.h"
-#endif
-
-int temp_sensor_read(enum temp_sensor_id id, int *temp_ptr)
-{
-	const struct temp_sensor_t *sensor;
-
-	if (id < 0 || id >= TEMP_SENSOR_COUNT)
-		return EC_ERROR_INVAL;
-	sensor = temp_sensors + id;
-
-#ifdef CONFIG_ZEPHYR
-	return sensor->read(sensor, temp_ptr);
-#else
-	return sensor->read(sensor->idx, temp_ptr);
-#endif
-}
-
-static void update_mapped_memory(void)
-{
-	int i, t;
-	uint8_t *mptr = host_get_memmap(EC_MEMMAP_TEMP_SENSOR);
-
-	for (i = 0; i < TEMP_SENSOR_COUNT; i++, mptr++) {
-		/*
-		 * Switch to second range if first one is full, or stop if
-		 * second range is also full.
-		 */
-		if (i == EC_TEMP_SENSOR_ENTRIES)
-			mptr = host_get_memmap(EC_MEMMAP_TEMP_SENSOR_B);
-		else if (i >= EC_TEMP_SENSOR_ENTRIES +
-			 EC_TEMP_SENSOR_B_ENTRIES)
-			break;
-
-		switch (temp_sensor_read(i, &t)) {
-		case EC_ERROR_NOT_POWERED:
-			*mptr = EC_TEMP_SENSOR_NOT_POWERED;
-			break;
-		case EC_ERROR_NOT_CALIBRATED:
-			*mptr = EC_TEMP_SENSOR_NOT_CALIBRATED;
-			break;
-		case EC_SUCCESS:
-			*mptr = t - EC_TEMP_SENSOR_OFFSET;
-			break;
-		default:
-			*mptr = EC_TEMP_SENSOR_ERROR;
-		}
-	}
-}
-/* Run after other TEMP tasks, so sensors will have updated first. */
-DECLARE_HOOK(HOOK_SECOND, update_mapped_memory, HOOK_PRIO_TEMP_SENSOR_DONE);
-
-static void temp_sensor_init(void)
-{
-	int i;
-	uint8_t *base, *base_b;
-
-	/*
-	 * Initialize memory-mapped data so that if a temperature value is read
-	 * before we actually poll the sensors, we don't return an impossible
-	 * or out-of-range value.
-	 */
-	base = host_get_memmap(EC_MEMMAP_TEMP_SENSOR);
-	base_b = host_get_memmap(EC_MEMMAP_TEMP_SENSOR_B);
-	for (i = 0; i < TEMP_SENSOR_COUNT; ++i) {
-		if (i < EC_TEMP_SENSOR_ENTRIES)
-			base[i] = EC_TEMP_SENSOR_DEFAULT;
-		else
-			base_b[i - EC_TEMP_SENSOR_ENTRIES] =
-				EC_TEMP_SENSOR_DEFAULT;
-	}
-
-	/* Set the rest of memory region to SENSOR_NOT_PRESENT */
-	for (; i < EC_TEMP_SENSOR_ENTRIES + EC_TEMP_SENSOR_B_ENTRIES; ++i) {
-		if (i < EC_TEMP_SENSOR_ENTRIES)
-			base[i] = EC_TEMP_SENSOR_NOT_PRESENT;
-		else
-			base_b[i - EC_TEMP_SENSOR_ENTRIES] =
-				EC_TEMP_SENSOR_NOT_PRESENT;
-	}
-
-	/* Temp sensor data is present, with B range supported. */
-	*host_get_memmap(EC_MEMMAP_THERMAL_VERSION) = 2;
-}
-DECLARE_HOOK(HOOK_INIT, temp_sensor_init, HOOK_PRIO_DEFAULT);
-
-/*****************************************************************************/
-/* Console commands */
-
-#ifdef CONFIG_CMD_TEMP_SENSOR
-int console_command_temps(int argc, char **argv)
-{
-	int t, i;
-	int rv, rv1 = EC_SUCCESS;
-
-	for (i = 0; i < TEMP_SENSOR_COUNT; ++i) {
-		ccprintf("  %-20s: ", temp_sensors[i].name);
-		rv = temp_sensor_read(i, &t);
-		if (rv)
-			rv1 = rv;
-
-		switch (rv) {
-		case EC_SUCCESS:
-			ccprintf("%d K = %d C", t, K_TO_C(t));
-#ifdef CONFIG_THROTTLE_AP
-			if (thermal_params[i].temp_fan_off &&
-			    thermal_params[i].temp_fan_max)
-				ccprintf("  %d%%",
-					 thermal_fan_percent(
-						 thermal_params[i].temp_fan_off,
-						 thermal_params[i].temp_fan_max,
-						 t));
-#endif
-			ccprintf("\n");
-			break;
-		case EC_ERROR_NOT_POWERED:
-			ccprintf("Not powered\n");
-			break;
-		case EC_ERROR_NOT_CALIBRATED:
-			ccprintf("Not calibrated\n");
-			break;
-		default:
-			ccprintf("Error %d\n", rv);
-		}
-	}
-
-	return rv1;
-}
-DECLARE_CONSOLE_COMMAND(temps, console_command_temps,
-			NULL,
-			"Print temp sensors");
-#endif
-
-/*****************************************************************************/
-/* Host commands */
-
-enum ec_status temp_sensor_command_get_info(struct host_cmd_handler_args *args)
-{
-	const struct ec_params_temp_sensor_get_info *p = args->params;
-	struct ec_response_temp_sensor_get_info *r = args->response;
-	int id = p->id;
-
-	if (id >= TEMP_SENSOR_COUNT)
-		return EC_RES_ERROR;
-
-	strzcpy(r->sensor_name, temp_sensors[id].name, sizeof(r->sensor_name));
-	r->sensor_type = temp_sensors[id].type;
-
-	args->response_size = sizeof(*r);
-
-	return EC_RES_SUCCESS;
-}
-DECLARE_HOST_COMMAND(EC_CMD_TEMP_SENSOR_GET_INFO,
-		     temp_sensor_command_get_info,
-		     EC_VER_MASK(0));