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

diff --git a/common/device_event.c b/common/device_event.c
deleted file mode 100644
index f7944ae930..0000000000
--- a/common/device_event.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Copyright 2017 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.
- */
-
-/* Device event commands for Chrome EC */
-
-#include "atomic.h"
-#include "common.h"
-#include "console.h"
-#include "host_command.h"
-#include "lpc.h"
-#include "mkbp_event.h"
-#include "util.h"
-
-/* Console output macros */
-#define CPUTS(outstr) cputs(CC_EVENTS, outstr)
-#define CPRINTS(format, args...) cprints(CC_EVENTS, format, ## args)
-
-static uint32_t device_current_events;
-static uint32_t device_enabled_events;
-
-uint32_t device_get_current_events(void)
-{
-	return device_current_events;
-}
-
-static uint32_t device_get_and_clear_events(void)
-{
-	return atomic_clear(&device_current_events);
-}
-
-static uint32_t device_get_enabled_events(void)
-{
-	return device_enabled_events;
-}
-
-void device_set_events(uint32_t mask)
-{
-	/* Ignore events that are not enabled */
-	mask &= device_enabled_events;
-
-	if ((device_current_events & mask) != mask) {
-		CPRINTS("device event set 0x%08x", mask);
-	} else {
-		/*
-		 * We are here because there is no flag change (1->1, 0->0).
-		 * For 0->0, we shouldn't notify the host because the flag is
-		 * disabled. For 1->1, it's most likely redundant but we still
-		 * need to notify the host in case the host didn't have a
-		 * chance to read the flags. Otherwise, the flag would never be
-		 * consumed because the host would never be notified.
-		 */
-		if (!mask)
-			return;
-	}
-
-	atomic_or(&device_current_events, mask);
-
-	/* Signal host that a device event is pending */
-	host_set_single_event(EC_HOST_EVENT_DEVICE);
-}
-
-void device_clear_events(uint32_t mask)
-{
-	/* Only print if something's about to change */
-	if (device_current_events & mask)
-		CPRINTS("device event clear 0x%08x", mask);
-
-	atomic_clear_bits(&device_current_events, mask);
-}
-
-static void device_set_enabled_events(uint32_t mask)
-{
-	if ((device_enabled_events & mask) != mask)
-		CPRINTS("device enabled events set 0x%08x", mask);
-
-	device_enabled_events = mask;
-}
-
-void device_enable_event(enum ec_device_event event)
-{
-	atomic_or(&device_enabled_events, EC_DEVICE_EVENT_MASK(event));
-}
-
-/*****************************************************************************/
-/* Console commands */
-
-#ifdef CONFIG_CMD_DEVICE_EVENT
-static int command_device_event(int argc, char **argv)
-{
-	/* Handle sub-commands */
-	if (argc == 3) {
-		char *e;
-		int i = strtoi(argv[2], &e, 0);
-
-		if (*e)
-			return EC_ERROR_PARAM2;
-		else if (!strcasecmp(argv[1], "set"))
-			device_set_events(i);
-		else if (!strcasecmp(argv[1], "clear"))
-			device_clear_events(i);
-		else if (!strcasecmp(argv[1], "enable"))
-			device_set_enabled_events(i);
-		else
-			return EC_ERROR_PARAM1;
-	}
-
-	ccprintf("Enabled Events:  0x%08x\n", device_get_enabled_events());
-	ccprintf("Current Events:  0x%08x\n", device_get_current_events());
-
-	return EC_SUCCESS;
-}
-DECLARE_CONSOLE_COMMAND(deviceevent, command_device_event,
-			"[set | clear | enable] [mask]",
-			"Print / set device event state");
-#endif
-
-/*****************************************************************************/
-/* Host commands */
-
-static enum ec_status device_event_cmd(struct host_cmd_handler_args *args)
-{
-	const struct ec_params_device_event *p = args->params;
-	struct ec_response_device_event *r = args->response;
-
-	switch (p->param) {
-	case EC_DEVICE_EVENT_PARAM_GET_CURRENT_EVENTS:
-		r->event_mask = device_get_and_clear_events();
-		break;
-	case EC_DEVICE_EVENT_PARAM_GET_ENABLED_EVENTS:
-		r->event_mask = device_get_enabled_events();
-		break;
-	case EC_DEVICE_EVENT_PARAM_SET_ENABLED_EVENTS:
-		device_set_enabled_events(p->event_mask);
-		r->event_mask = device_get_enabled_events();
-		break;
-	default:
-		return EC_RES_INVALID_PARAM;
-	}
-
-	args->response_size = sizeof(*r);
-
-	return EC_RES_SUCCESS;
-}
-DECLARE_HOST_COMMAND(EC_CMD_DEVICE_EVENT, device_event_cmd, EC_VER_MASK(0));