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

diff --git a/test/button.c b/test/button.c
deleted file mode 100644
index e457eaa786..0000000000
--- a/test/button.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/* Copyright 2014 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.
- *
- * Test non-keyboard buttons.
-*
- * Using GPIOS and buttons[] defined in board/host/board.c
- * Volume down is active low with a debounce time of 30 mSec.
- * Volume up is active high with a debounce time of 60 mSec.
- *
- */
-
-#include "button.h"
-#include "common.h"
-#include "console.h"
-#include "gpio.h"
-#include "host_command.h"
-#include "test_util.h"
-#include "timer.h"
-#include "keyboard_config.h"
-#include "keyboard_protocol.h"
-#include "util.h"
-
-#define UNCHANGED -1
-
-uint8_t keyboard_cols = KEYBOARD_COLS_MAX;
-
-static const struct button_config *button_vol_down =
-	&buttons[BUTTON_VOLUME_DOWN];
-static const struct button_config *button_vol_up = &buttons[BUTTON_VOLUME_UP];
-
-static int button_state[BUTTON_COUNT];
-
-/*
- * Callback from the button handling logic.
- * This is normally implemented by a keyboard protocol handler.
- */
-void keyboard_update_button(enum keyboard_button_type button, int is_pressed)
-{
-	int i;
-
-	for (i = 0; i < BUTTON_COUNT; i++) {
-		if (buttons[i].type == button) {
-			button_state[i] = is_pressed;
-			break;
-		}
-	}
-}
-
-/* Test pressing a button */
-static int test_button_press(void)
-{
-	gpio_set_level(button_vol_down->gpio, 0);
-	msleep(100);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 1);
-
-	return EC_SUCCESS;
-}
-
-/* Test releasing a button */
-static int test_button_release(void)
-{
-	gpio_set_level(button_vol_up->gpio, 0);
-	msleep(100);
-	gpio_set_level(button_vol_up->gpio, 1);
-	msleep(100);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_UP] == 0);
-
-	return EC_SUCCESS;
-}
-
-/* A press shorter than the debounce time should not trigger an update */
-static int test_button_debounce_short_press(void)
-{
-	gpio_set_level(button_vol_down->gpio, 0);
-	msleep(10);
-	gpio_set_level(button_vol_down->gpio, 1);
-	msleep(100);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == UNCHANGED);
-
-	return EC_SUCCESS;
-}
-
-/* A short bounce while pressing should still result in a button press */
-static int test_button_debounce_short_bounce(void)
-{
-	gpio_set_level(button_vol_down->gpio, 0);
-	msleep(10);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == UNCHANGED);
-	gpio_set_level(button_vol_down->gpio, 1);
-	msleep(10);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == UNCHANGED);
-	gpio_set_level(button_vol_down->gpio, 0);
-	msleep(20);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == UNCHANGED);
-	msleep(20);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 1);
-
-	return EC_SUCCESS;
-}
-
-/* Button level must be stable for the entire debounce interval */
-static int test_button_debounce_stability(void)
-{
-	gpio_set_level(button_vol_down->gpio, 0);
-	msleep(20);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == UNCHANGED);
-	gpio_set_level(button_vol_down->gpio, 1);
-	msleep(20);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == UNCHANGED);
-	gpio_set_level(button_vol_down->gpio, 0);
-	msleep(20);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == UNCHANGED);
-	msleep(20);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 1);
-	msleep(60);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 1);
-	gpio_set_level(button_vol_down->gpio, 1);
-	msleep(20);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 1);
-	msleep(20);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 0);
-	msleep(60);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 0);
-
-	return EC_SUCCESS;
-}
-
-/* Test pressing both buttons at different times */
-static int test_button_press_both(void)
-{
-	gpio_set_level(button_vol_down->gpio, 0);
-	msleep(10);
-	gpio_set_level(button_vol_up->gpio, 0);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == UNCHANGED);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_UP] == UNCHANGED);
-	msleep(30);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 1);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_UP] == UNCHANGED);
-	msleep(40);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 1);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_UP] == 1);
-
-	return EC_SUCCESS;
-}
-
-/* Button simulate test cases */
-static int send_button_hostcmd(uint32_t btn_mask, uint32_t press_ms)
-{
-	struct ec_params_button p;
-
-	p.press_ms = press_ms;
-	p.btn_mask = btn_mask;
-
-	return test_send_host_command(EC_CMD_BUTTON, 0, &p, sizeof(p), NULL, 0);
-}
-
-static void test_sim_button_util(uint32_t btn_mask, uint32_t press_ms)
-{
-	send_button_hostcmd(btn_mask, press_ms);
-	msleep(100);
-}
-
-/* Test simulate pressing a button */
-static int test_sim_button_press(void)
-{
-	test_sim_button_util(1 << KEYBOARD_BUTTON_VOLUME_DOWN, 100);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 1);
-
-	return EC_SUCCESS;
-}
-
-/* Test simulate releasing a button */
-static int test_sim_button_release(void)
-{
-	test_sim_button_util(1 << KEYBOARD_BUTTON_VOLUME_UP, 50);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_UP] == 0);
-
-	return EC_SUCCESS;
-}
-
-/* A press shorter than the debounce time should not trigger an update */
-static int test_sim_button_debounce_short_press(void)
-{
-	test_sim_button_util(1 << KEYBOARD_BUTTON_VOLUME_DOWN, 10);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == UNCHANGED);
-
-	return EC_SUCCESS;
-}
-
-/* A short bounce while pressing should still result in a button press */
-static int test_sim_button_debounce_short_bounce(void)
-{
-	uint32_t btn_mask = 0;
-
-	btn_mask |= (1 << KEYBOARD_BUTTON_VOLUME_DOWN);
-	send_button_hostcmd(btn_mask, 10);
-	msleep(50);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == UNCHANGED);
-
-	send_button_hostcmd(btn_mask, 100);
-	msleep(20);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == UNCHANGED);
-	msleep(20);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 1);
-
-	return EC_SUCCESS;
-}
-
-/* Button level must be stable for the entire debounce interval */
-static int test_sim_button_debounce_stability(void)
-{
-	uint32_t btn_mask = 0;
-
-	btn_mask |= (1 << KEYBOARD_BUTTON_VOLUME_DOWN);
-	send_button_hostcmd(btn_mask, 10);
-	msleep(20);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == UNCHANGED);
-	msleep(20);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == UNCHANGED);
-
-	send_button_hostcmd(btn_mask, 100);
-	msleep(20);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == UNCHANGED);
-	msleep(20);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 1);
-	msleep(60);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 1);
-
-	msleep(20);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 1);
-	msleep(20);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 0);
-	msleep(60);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 0);
-
-	return EC_SUCCESS;
-}
-
-/* Test simulate pressing both buttons */
-static int test_sim_button_press_both(void)
-{
-	uint32_t btn_mask = 0;
-
-	btn_mask |= (1 << KEYBOARD_BUTTON_VOLUME_DOWN);
-	btn_mask |= (1 << KEYBOARD_BUTTON_VOLUME_UP);
-	send_button_hostcmd(btn_mask, 100);
-	msleep(10);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == UNCHANGED);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_UP] == UNCHANGED);
-	msleep(60);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 1);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_UP] == 1);
-	msleep(100);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_DOWN] == 0);
-	TEST_ASSERT(button_state[BUTTON_VOLUME_UP] == 0);
-
-	return EC_SUCCESS;
-}
-
-static void button_test_init(void)
-{
-	int i;
-
-	ccprints("Setting button GPIOs to inactive state");
-	for (i = 0; i < BUTTON_COUNT; i++)
-		gpio_set_level(buttons[i].gpio,
-			       !(buttons[i].flags & BUTTON_FLAG_ACTIVE_HIGH));
-
-	msleep(100);
-	for (i = 0; i < BUTTON_COUNT; i++)
-		button_state[i] = UNCHANGED;
-}
-
-void run_test(int argc, char **argv)
-{
-	test_reset();
-
-	button_init();
-
-	button_test_init();
-	RUN_TEST(test_button_press);
-
-	button_test_init();
-	RUN_TEST(test_button_release);
-
-	button_test_init();
-	RUN_TEST(test_button_debounce_short_press);
-
-	button_test_init();
-	RUN_TEST(test_button_debounce_short_bounce);
-
-	button_test_init();
-	RUN_TEST(test_button_debounce_stability);
-
-	button_test_init();
-	RUN_TEST(test_button_press_both);
-
-	button_test_init();
-	RUN_TEST(test_sim_button_press);
-
-	button_test_init();
-	RUN_TEST(test_sim_button_release);
-
-	button_test_init();
-	RUN_TEST(test_sim_button_debounce_short_press);
-
-	button_test_init();
-	RUN_TEST(test_sim_button_debounce_short_bounce);
-
-	button_test_init();
-	RUN_TEST(test_sim_button_debounce_stability);
-
-	button_test_init();
-	RUN_TEST(test_sim_button_press_both);
-
-	test_print_result();
-}