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, 196 deletions

diff --git a/test/online_calibration_spoof.c b/test/online_calibration_spoof.c
deleted file mode 100644
index 66ef5d01de..0000000000
--- a/test/online_calibration_spoof.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* Copyright 2020 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.
- */
-
-#include "accel_cal.h"
-#include "accelgyro.h"
-#include "hwtimer.h"
-#include "mag_cal.h"
-#include "online_calibration.h"
-#include "test_util.h"
-#include "gyro_cal_init_for_test.h"
-#include "gyro_cal.h"
-#include "timer.h"
-#include <stdio.h>
-
-int mkbp_send_event(uint8_t event_type)
-{
-	return 1;
-}
-
-/*
- * Mocked driver (can be re-used for all sensors).
- */
-
-static int mock_read_temp(const struct motion_sensor_t *s, int *temp)
-{
-	if (temp)
-		*temp = 200;
-	return EC_SUCCESS;
-}
-
-static struct accelgyro_drv mock_sensor_driver = {
-	.read_temp = mock_read_temp,
-};
-
-/*
- * Accelerometer, magnetometer, and gyroscope data structs.
- */
-
-static struct accel_cal_algo accel_cal_algos[] = { {
-	.newton_fit = NEWTON_FIT(4, 15, FLOAT_TO_FP(0.01f), FLOAT_TO_FP(0.25f),
-				 FLOAT_TO_FP(1.0e-8f), 100),
-} };
-
-static struct accel_cal accel_cal_data = {
-	.still_det =
-		STILL_DET(FLOAT_TO_FP(0.00025f), 800 * MSEC, 1200 * MSEC, 5),
-	.algos = accel_cal_algos,
-	.num_temp_windows = ARRAY_SIZE(accel_cal_algos),
-};
-
-static struct mag_cal_t mag_cal_data;
-
-static struct gyro_cal gyro_cal_data;
-
-/*
- * Motion sensor array and count.
- */
-
-struct motion_sensor_t motion_sensors[] = {
-	{
-		.type = MOTIONSENSE_TYPE_ACCEL,
-		.default_range = 4,
-		.drv = &mock_sensor_driver,
-		.online_calib_data[0] = {
-			.type_specific_data = &accel_cal_data,
-		},
-	},
-	{
-		.type = MOTIONSENSE_TYPE_MAG,
-		.default_range = 4,
-		.drv = &mock_sensor_driver,
-		.online_calib_data[0] = {
-			.type_specific_data = &mag_cal_data,
-		},
-	},
-	{
-		.type = MOTIONSENSE_TYPE_GYRO,
-		.default_range = 4,
-		.drv = &mock_sensor_driver,
-		.online_calib_data[0] = {
-			.type_specific_data = &gyro_cal_data,
-		},
-	},
-};
-
-const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
-
-static void spoof_sensor_data(struct motion_sensor_t *s, int x, int y, int z)
-{
-	struct ec_response_motion_sensor_data data;
-	uint32_t timestamp = 0;
-
-	/* Set the data and flags. */
-	data.data[X] = x;
-	data.data[Y] = y;
-	data.data[Z] = z;
-	s->flags |= MOTIONSENSE_FLAG_IN_SPOOF_MODE;
-
-	/* Pass the data to online_calibdation. */
-	online_calibration_process_data(&data, s, timestamp);
-}
-
-/*
- * Begin testing.
- */
-
-static int test_accel_calibration_on_spoof(void)
-{
-	struct ec_response_online_calibration_data out;
-
-	/* Send spoof data (1, 2, 3). */
-	spoof_sensor_data(&motion_sensors[0], 1, 2, 3);
-
-	/* Check that we have new values. */
-	TEST_ASSERT(online_calibration_has_new_values());
-
-	/* Get the new values for sensor 0. */
-	TEST_ASSERT(online_calibration_read(&motion_sensors[0], &out));
-
-	/* Validate the new values. */
-	TEST_EQ(out.data[X], 1, "%d");
-	TEST_EQ(out.data[Y], 2, "%d");
-	TEST_EQ(out.data[Z], 3, "%d");
-
-	/* Validate that no other sensors have data. */
-	TEST_ASSERT(!online_calibration_has_new_values());
-
-	return EC_SUCCESS;
-}
-
-static int test_mag_calibration_on_spoof(void)
-{
-	struct ec_response_online_calibration_data out;
-
-	/* Send spoof data (4, 5, 6). */
-	spoof_sensor_data(&motion_sensors[1], 4, 5, 6);
-
-	/* Check that we have new values. */
-	TEST_ASSERT(online_calibration_has_new_values());
-
-	/* Get the new values for sensor 0. */
-	TEST_ASSERT(online_calibration_read(&motion_sensors[1], &out));
-
-	/* Validate the new values. */
-	TEST_EQ(out.data[X], 4, "%d");
-	TEST_EQ(out.data[Y], 5, "%d");
-	TEST_EQ(out.data[Z], 6, "%d");
-
-	/* Validate that no other sensors have data. */
-	TEST_ASSERT(!online_calibration_has_new_values());
-
-	return EC_SUCCESS;
-}
-
-static int test_gyro_calibration_on_spoof(void)
-{
-	struct ec_response_online_calibration_data out;
-
-	/* Send spoof data (7, 8, 9). */
-	spoof_sensor_data(&motion_sensors[2], 7, 8, 9);
-
-	/* Check that we have new values. */
-	TEST_ASSERT(online_calibration_has_new_values());
-
-	/* Get the new values for sensor 0. */
-	TEST_ASSERT(online_calibration_read(&motion_sensors[2], &out));
-
-	/* Validate the new values. */
-	TEST_EQ(out.data[X], 7, "%d");
-	TEST_EQ(out.data[Y], 8, "%d");
-	TEST_EQ(out.data[Z], 9, "%d");
-
-	/* Validate that no other sensors have data. */
-	TEST_ASSERT(!online_calibration_has_new_values());
-
-	return EC_SUCCESS;
-}
-
-void before_test(void)
-{
-	online_calibration_init();
-	gyro_cal_initialization_for_test(&gyro_cal_data);
-}
-
-void run_test(int argc, char **argv)
-{
-	test_reset();
-
-	RUN_TEST(test_accel_calibration_on_spoof);
-	RUN_TEST(test_mag_calibration_on_spoof);
-	RUN_TEST(test_gyro_calibration_on_spoof);
-
-	test_print_result();
-}