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

diff --git a/test/usb_test/device_configuration.c b/test/usb_test/device_configuration.c
deleted file mode 100644
index 69f889c2d3..0000000000
--- a/test/usb_test/device_configuration.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright 2016 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 <errno.h>
-#include <getopt.h>
-#include <libusb.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* Options */
-static uint16_t vid = 0x18d1;			/* Google */
-static uint16_t pid = 0x5014;			/* Cr50 */
-
-static char *progname;
-
-static void usage(int errs)
-{
-	printf("\nUsage: %s [vid:pid] [value]\n"
-	       "\n"
-	       "Set/Get the USB Device Configuration value\n"
-	       "\n"
-	       "The default vid:pid is %04x:%04x\n"
-	       "\n", progname, vid, pid);
-
-	exit(!!errs);
-}
-
-/* Globals */
-struct libusb_device_handle *devh = 0;
-
-static void stupid_usb(const char *format, ...)
-{
-	va_list ap;
-
-	va_start(ap, format);
-	vfprintf(stderr, format, ap);
-	va_end(ap);
-
-	if (devh)
-		libusb_close(devh);
-
-	libusb_exit(NULL);
-
-	exit(1);
-}
-
-
-int main(int argc, char *argv[])
-{
-	int r = 1;
-	int errorcnt = 0;
-	int do_set = 0;
-	uint16_t setval = 0;
-	uint8_t buf[80];			/* Arbitrary size */
-	int i;
-
-	progname = strrchr(argv[0], '/');
-	if (progname)
-		progname++;
-	else
-		progname = argv[0];
-
-	opterr = 0;				/* quiet, you */
-	while ((i = getopt(argc, argv, "")) != -1) {
-		switch (i) {
-		case 'h':
-			usage(errorcnt);
-			break;
-		case 0:				/* auto-handled option */
-			break;
-		case '?':
-			if (optopt)
-				printf("Unrecognized option: -%c\n", optopt);
-			else
-				printf("Unrecognized option: %s\n",
-				       argv[optind - 1]);
-			errorcnt++;
-			break;
-		case ':':
-			printf("Missing argument to %s\n", argv[optind - 1]);
-			errorcnt++;
-			break;
-		default:
-			printf("Internal error at %s:%d\n", __FILE__, __LINE__);
-			exit(1);
-		}
-	}
-
-	if (errorcnt)
-		usage(errorcnt);
-
-	if (optind < argc) {
-		uint16_t v, p;
-
-		if (2 == sscanf(argv[optind], "%hx:%hx", &v, &p)) {
-			vid = v;
-			pid = p;
-			optind++;
-		}
-	}
-
-	if (optind < argc) {
-		do_set = 1;
-		setval = atoi(argv[optind]);
-	}
-
-	r = libusb_init(NULL);
-	if (r) {
-		printf("libusb_init() returned 0x%x: %s\n",
-		       r, libusb_error_name(r));
-		return 1;
-	}
-
-	devh = libusb_open_device_with_vid_pid(NULL, vid, pid);
-	if (!devh) {
-		perror(progname);
-		stupid_usb("Can't open device %04x:%04x\n", vid, pid);
-	}
-
-
-	/* Set config*/
-	if (do_set) {
-		printf("SetCfg %d\n", setval);
-		r = libusb_control_transfer(
-			devh,
-			0x00,			/* bmRequestType */
-			0x09,			/* bRequest */
-			setval,			/* wValue */
-			0x0000,			/* wIndex */
-			NULL,			/* data */
-			0x0000,			/* wLength */
-			1000);			/* timeout (ms) */
-
-		if (r < 0)
-			printf("transfer returned 0x%x %s\n",
-			       r, libusb_error_name(r));
-	}
-
-	/* Get config */
-	memset(buf, 0, sizeof(buf));
-
-	r = libusb_control_transfer(
-		devh,
-		0x80,				/* bmRequestType */
-		0x08,				/* bRequest */
-		0x0000,				/* wValue */
-		0x0000,				/* wIndex */
-		buf,				/* data */
-		0x0001,				/* wLength */
-		1000);				/* timeout (ms) */
-
-	if (r <= 0)
-		stupid_usb("GetCfg transfer() returned 0x%x %s\n",
-			   r, libusb_error_name(r));
-
-	printf("GetCfg returned %d bytes:", r);
-	for (i = 0; i < r; i++)
-		printf(" 0x%02x", buf[i]);
-	printf("\n");
-
-	/* done */
-	if (devh)
-		libusb_close(devh);
-	libusb_exit(NULL);
-
-	return 0;
-}