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

diff --git a/zephyr/emul/emul_common_i2c.c b/zephyr/emul/emul_common_i2c.c
deleted file mode 100644
index bd811f1424..0000000000
--- a/zephyr/emul/emul_common_i2c.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/* Copyright 2021 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.
- */
-
-#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
-LOG_MODULE_REGISTER(emul_common_i2c);
-
-#include <device.h>
-#include <emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
-
-#include "emul/emul_common_i2c.h"
-
-/** Check description in emul_common_i2c.h */
-int i2c_common_emul_lock_data(struct i2c_emul *emul, k_timeout_t timeout)
-{
-	struct i2c_common_emul_data *data;
-
-	data = CONTAINER_OF(emul, struct i2c_common_emul_data, emul);
-
-	return k_mutex_lock(&data->data_mtx, timeout);
-}
-
-/** Check description in emul_common_i2c.h */
-int i2c_common_emul_unlock_data(struct i2c_emul *emul)
-{
-	struct i2c_common_emul_data *data;
-
-	data = CONTAINER_OF(emul, struct i2c_common_emul_data, emul);
-
-	return k_mutex_unlock(&data->data_mtx);
-}
-
-/** Check description in emul_common_i2c.h */
-void i2c_common_emul_set_write_func(struct i2c_emul *emul,
-				    i2c_common_emul_write_func func, void *data)
-{
-	struct i2c_common_emul_data *emul_data;
-
-	emul_data = CONTAINER_OF(emul, struct i2c_common_emul_data, emul);
-	emul_data->write_func = func;
-	emul_data->write_func_data = data;
-}
-
-/** Check description in emul_common_i2c.h */
-void i2c_common_emul_set_read_func(struct i2c_emul *emul,
-				   i2c_common_emul_read_func func, void *data)
-{
-	struct i2c_common_emul_data *emul_data;
-
-	emul_data = CONTAINER_OF(emul, struct i2c_common_emul_data, emul);
-	emul_data->read_func = func;
-	emul_data->read_func_data = data;
-}
-
-/** Check description in emul_common_i2c.h */
-void i2c_common_emul_set_read_fail_reg(struct i2c_emul *emul, int reg)
-{
-	struct i2c_common_emul_data *data;
-
-	data = CONTAINER_OF(emul, struct i2c_common_emul_data, emul);
-	data->read_fail_reg = reg;
-}
-
-/** Check description in emul_common_i2c.h */
-void i2c_common_emul_set_write_fail_reg(struct i2c_emul *emul, int reg)
-{
-	struct i2c_common_emul_data *data;
-
-	data = CONTAINER_OF(emul, struct i2c_common_emul_data, emul);
-	data->write_fail_reg = reg;
-}
-
-/**
- * @brief Call start_write emulator callback if set. It handles first byte
- *        of I2C write message.
- *
- * @param emul Pointer to emulator
- * @param data Pointer to emulator data
- *
- * @retval start_write emulator callback return code
- */
-static int i2c_common_emul_start_write(struct i2c_emul *emul,
-				       struct i2c_common_emul_data *data)
-{
-	int ret = 0;
-
-	data->msg_byte = 0;
-
-	if (data->start_write) {
-		k_mutex_lock(&data->data_mtx, K_FOREVER);
-		ret = data->start_write(emul, data->cur_reg);
-		k_mutex_unlock(&data->data_mtx);
-	}
-
-	return ret;
-}
-
-/**
- * @brief Call finish_write emulator callback if set. It is called after last
- *        byte of I2C write message.
- *
- * @param emul Pointer to emulator
- * @param data Pointer to emulator data
- *
- * @retval finish_write emulator callback return code
- */
-static int i2c_common_emul_finish_write(struct i2c_emul *emul,
-					struct i2c_common_emul_data *data)
-{
-	int ret = 0;
-
-	if (data->finish_write) {
-		k_mutex_lock(&data->data_mtx, K_FOREVER);
-		ret = data->finish_write(emul, data->cur_reg, data->msg_byte);
-		k_mutex_unlock(&data->data_mtx);
-	}
-
-	return ret;
-}
-
-/**
- * @brief Call start_read emulator callback if set. It prepares emulator at
- *        the beginning of I2C read message.
- *
- * @param emul Pointer to emulator
- * @param data Pointer to emulator data
- *
- * @retval start_read emulator callback return code
- */
-static int i2c_common_emul_start_read(struct i2c_emul *emul,
-				      struct i2c_common_emul_data *data)
-{
-	int ret = 0;
-
-	data->msg_byte = 0;
-
-	if (data->start_read) {
-		k_mutex_lock(&data->data_mtx, K_FOREVER);
-		ret = data->start_read(emul, data->cur_reg);
-		k_mutex_unlock(&data->data_mtx);
-	}
-
-	return ret;
-}
-
-/**
- * @brief Call finish_read emulator callback if set. It is called after last
- *        byte of I2C read message.
- *
- * @param emul Pointer to emulator
- * @param data Pointer to emulator data
- *
- * @retval finish_read emulator callback return code
- */
-static int i2c_common_emul_finish_read(struct i2c_emul *emul,
-				       struct i2c_common_emul_data *data)
-{
-	int ret = 0;
-
-	if (data->finish_read) {
-		k_mutex_lock(&data->data_mtx, K_FOREVER);
-		ret = data->finish_read(emul, data->cur_reg, data->msg_byte);
-		k_mutex_unlock(&data->data_mtx);
-	}
-
-	return ret;
-}
-
-/**
- * @brief Handle byte from I2C write message. First custom user handler is
- *        called (if set). Next accessed register is compared with selected
- *        by user fail register. Lastly, specific I2C device emulator handler
- *        is called.
- *
- * @param emul Pointer to emulator
- * @param data Pointer to emulator data
- * @param val Value of current byte
- *
- * @retval 0 If successful
- * @retval -EIO General input / output error
- */
-static int i2c_common_emul_write_byte(struct i2c_emul *emul,
-				      struct i2c_common_emul_data *data,
-				      uint8_t val)
-{
-	int reg, ret;
-
-	/* Custom user handler */
-	if (data->write_func) {
-		ret = data->write_func(emul, data->cur_reg, val, data->msg_byte,
-				       data->write_func_data);
-		if (ret < 0) {
-			return -EIO;
-		} else if (ret == 0) {
-			return 0;
-		}
-	}
-	/* Check if user wants to fail on accessed register */
-	if (data->access_reg) {
-		reg = data->access_reg(emul, data->cur_reg, data->msg_byte,
-				       false /* = read */);
-	} else {
-		/* Ignore first (register address) byte */
-		reg = data->cur_reg + data->msg_byte - 1;
-	}
-
-	if (data->write_fail_reg == reg ||
-	    data->write_fail_reg == I2C_COMMON_EMUL_FAIL_ALL_REG) {
-		return -EIO;
-	}
-	/* Emulator handler */
-	if (data->write_byte) {
-		k_mutex_lock(&data->data_mtx, K_FOREVER);
-		ret = data->write_byte(emul, data->cur_reg, val,
-				       data->msg_byte);
-		k_mutex_unlock(&data->data_mtx);
-		if (ret) {
-			return -EIO;
-		}
-	}
-
-	return 0;
-}
-
-/**
- * @brief Handle byte from I2C read message. First custom user handler is
- *        called (if set). Next accessed register is compared with selected
- *        by user fail register. Lastly, specific I2C device emulator handler
- *        is called.
- *
- * @param emul Pointer to emulator
- * @param data Pointer to emulator data
- * @param val Pointer to buffer where current response byte should be stored
- *
- * @retval 0 If successful
- * @retval -EIO General input / output error
- */
-static int i2c_common_emul_read_byte(struct i2c_emul *emul,
-				     struct i2c_common_emul_data *data,
-				     uint8_t *val)
-{
-	int reg, ret;
-
-	/* Custom user handler */
-	if (data->read_func) {
-		ret = data->read_func(emul, data->cur_reg, val, data->msg_byte,
-				      data->read_func_data);
-		if (ret < 0) {
-			return -EIO;
-		} else if (ret == 0) {
-			return 0;
-		}
-	}
-	/* Check if user wants to fail on accessed register */
-	if (data->access_reg) {
-		reg = data->access_reg(emul, data->cur_reg, data->msg_byte,
-				       true /* = read */);
-	} else {
-		reg = data->cur_reg + data->msg_byte;
-	}
-
-	if (data->read_fail_reg == reg ||
-	    data->read_fail_reg == I2C_COMMON_EMUL_FAIL_ALL_REG) {
-		return -EIO;
-	}
-	/* Emulator handler */
-	if (data->read_byte) {
-		k_mutex_lock(&data->data_mtx, K_FOREVER);
-		ret = data->read_byte(emul, data->cur_reg, val, data->msg_byte);
-		k_mutex_unlock(&data->data_mtx);
-		if (ret) {
-			return -EIO;
-		}
-	}
-
-	return 0;
-}
-
-/** Check description in emul_common_i2c.h */
-int i2c_common_emul_transfer(struct i2c_emul *emul, struct i2c_msg *msgs,
-			     int num_msgs, int addr)
-{
-	const struct i2c_common_emul_cfg *cfg;
-	struct i2c_common_emul_data *data;
-	bool read, stop;
-	int ret, i;
-
-	data = CONTAINER_OF(emul, struct i2c_common_emul_data, emul);
-	cfg = data->cfg;
-
-	if (cfg->addr != addr) {
-		LOG_ERR("Address mismatch, expected %02x, got %02x", cfg->addr,
-			addr);
-		return -EIO;
-	}
-
-	i2c_dump_msgs(cfg->dev_label, msgs, num_msgs, addr);
-
-	for (; num_msgs > 0; num_msgs--, msgs++) {
-		read = msgs->flags & I2C_MSG_READ;
-		stop = msgs->flags & I2C_MSG_STOP;
-
-		switch (data->msg_state) {
-		case I2C_COMMON_EMUL_IN_WRITE:
-			if (read) {
-				data->msg_state = I2C_COMMON_EMUL_NONE_MSG;
-				ret = i2c_common_emul_finish_write(emul, data);
-				if (ret) {
-					return ret;
-				}
-				ret = i2c_common_emul_start_read(emul, data);
-				if (ret) {
-					return ret;
-				}
-			}
-			break;
-		case I2C_COMMON_EMUL_IN_READ:
-			if (!read) {
-				data->msg_state = I2C_COMMON_EMUL_NONE_MSG;
-				ret = i2c_common_emul_finish_read(emul, data);
-				if (ret) {
-					return ret;
-				}
-				/* Wait for write message with acctual data */
-				if (msgs->len == 0) {
-					continue;
-				}
-				/* Dispatch command/register address */
-				data->cur_reg = msgs->buf[0];
-				ret = i2c_common_emul_start_write(emul, data);
-				if (ret) {
-					return ret;
-				}
-			}
-			break;
-		case I2C_COMMON_EMUL_NONE_MSG:
-			if (read) {
-				ret = i2c_common_emul_start_read(emul, data);
-				if (ret) {
-					return ret;
-				}
-			} else {
-				/* Wait for write message with acctual data */
-				if (msgs->len == 0) {
-					continue;
-				}
-				/* Dispatch command/register address */
-				data->cur_reg = msgs->buf[0];
-				ret = i2c_common_emul_start_write(emul, data);
-				if (ret) {
-					return ret;
-				}
-			}
-		}
-
-		data->msg_state = read ? I2C_COMMON_EMUL_IN_READ
-				       : I2C_COMMON_EMUL_IN_WRITE;
-
-		if (stop) {
-			data->msg_state = I2C_COMMON_EMUL_NONE_MSG;
-		}
-
-		if (!read) {
-			/*
-			 * All current emulators use first byte of write message
-			 * as command/register address for following write bytes
-			 * or read message. Skip first byte which was dispatched
-			 * already.
-			 */
-			if (data->msg_byte == 0) {
-				data->msg_byte = 1;
-				i = 1;
-			} else {
-				i = 0;
-			}
-			/* Dispatch write command */
-			for (; i < msgs->len; i++, data->msg_byte++) {
-				ret = i2c_common_emul_write_byte(emul, data,
-								 msgs->buf[i]);
-				if (ret) {
-					return ret;
-				}
-			}
-			/* Finish write command */
-			if (stop) {
-				ret = i2c_common_emul_finish_write(emul, data);
-				if (ret) {
-					return ret;
-				}
-			}
-		} else {
-			/* Dispatch read command */
-			for (i = 0; i < msgs->len; i++, data->msg_byte++) {
-				ret = i2c_common_emul_read_byte(emul, data,
-							       &(msgs->buf[i]));
-				if (ret) {
-					return ret;
-				}
-			}
-
-			/* Finish read command */
-			if (stop) {
-				ret = i2c_common_emul_finish_read(emul, data);
-				if (ret) {
-					return ret;
-				}
-			}
-		}
-	}
-
-	return 0;
-}
-
-/** Check description in emul_common_i2c.h */
-void i2c_common_emul_init(struct i2c_common_emul_data *data)
-{
-	data->msg_state = I2C_COMMON_EMUL_NONE_MSG;
-	data->msg_byte = 0;
-	data->cur_reg = 0;
-
-	data->write_func = NULL;
-	data->read_func = NULL;
-
-	data->write_fail_reg = I2C_COMMON_EMUL_NO_FAIL_REG;
-	data->read_fail_reg = I2C_COMMON_EMUL_NO_FAIL_REG;
-
-	k_mutex_init(&data->data_mtx);
-}