1 files changed, 12 insertions, 142 deletions

diff --git a/common/ioexpander.c b/common/ioexpander.c
index 06ca94b8bc..6caa7f4bc1 100644
--- a/common/ioexpander.c
+++ b/common/ioexpander.c
@@ -5,7 +5,6 @@
 
 /* IO Expander Controller Common Code */
 
-#include "console.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "ioexpander.h"
@@ -15,25 +14,6 @@
 #define CPRINTF(format, args...) cprintf(CC_GPIO, format, ## args)
 #define CPRINTS(format, args...) cprints(CC_GPIO, format, ## args)
 
-static uint8_t last_val[(IOEX_COUNT + 7) / 8];
-
-static int last_val_changed(enum ioex_signal signal, int v)
-{
-	const int i = signal - IOEX_SIGNAL_START;
-
-	ASSERT(signal_is_ioex(signal));
-
-	if (v && !(last_val[i / 8] & (BIT(i % 8)))) {
-		last_val[i / 8] |= BIT(i % 8);
-		return 1;
-	} else if (!v && last_val[i / 8] & (BIT(i % 8))) {
-		last_val[i / 8] &= ~(BIT(i % 8));
-		return 1;
-	} else {
-		return 0;
-	}
-}
-
 int signal_is_ioex(int signal)
 {
 	return ((signal >= IOEX_SIGNAL_START) && (signal < IOEX_SIGNAL_END));
@@ -108,6 +88,18 @@ int ioex_disable_interrupt(enum ioex_signal signal)
 	return drv->enable_interrupt(g->ioex, g->port, g->mask, 0);
 }
 
+int ioex_get_ioex_flags(enum ioex_signal signal, int *val)
+{
+	const struct ioex_info *g = ioex_get_signal_info(signal);
+
+	if (g == NULL)
+		return EC_ERROR_BUSY;
+
+	*val = ioex_config[g->ioex].flags;
+
+	return EC_SUCCESS;
+}
+
 int ioex_get_flags(enum ioex_signal signal, int *flags)
 {
 	const struct ioex_info *g = ioex_get_signal_info(signal);
@@ -222,125 +214,3 @@ const char *ioex_get_name(enum ioex_signal signal)
 
 	return g->name;
 }
-
-static void print_ioex_info(enum ioex_signal signal)
-{
-	int changed, v, val;
-	int flags = 0;
-	const struct ioex_info *g = ioex_list + signal - IOEX_SIGNAL_START;
-
-	if (!(ioex_config[g->ioex].flags & IOEX_FLAGS_INITIALIZED)) {
-		ccprintf("  DISABLED %s\n", ioex_get_name(signal));
-		return;
-	}
-
-
-	v = ioex_get_level(signal, &val);
-	if (v) {
-		ccprintf("Fail to get %s level\n", ioex_get_name(signal));
-		return;
-	}
-	v = ioex_get_flags(signal, &flags);
-	if (v) {
-		ccprintf("Fail to get %s flags\n", ioex_get_name(signal));
-		return;
-	}
-
-	changed = last_val_changed(signal, val);
-
-	ccprintf("  %d%c %s%s%s%s%s%s\n", val,
-		 (changed ? '*' : ' '),
-		 (flags & GPIO_INPUT ? "I " : ""),
-		 (flags & GPIO_OUTPUT ? "O " : ""),
-		 (flags & GPIO_LOW ? "L " : ""),
-		 (flags & GPIO_HIGH ? "H " : ""),
-		 (flags & GPIO_OPEN_DRAIN ? "ODR " : ""),
-		ioex_get_name(signal));
-
-	/* Flush console to avoid truncating output */
-	cflush();
-}
-
-static int ioex_get_default_flags(enum ioex_signal signal)
-{
-	const struct ioex_info *g = ioex_get_signal_info(signal);
-
-	if (g == NULL)
-		return 0;
-
-	return g->flags;
-}
-
-/* IO expander commands */
-static enum ioex_signal find_ioex_by_name(const char *name)
-{
-	enum ioex_signal signal;
-
-	if (!name)
-		return IOEX_SIGNAL_END;
-
-	for (signal = IOEX_SIGNAL_START; signal < IOEX_SIGNAL_END; signal++) {
-		if (!strcasecmp(name, ioex_get_name(signal)))
-			return signal;
-	}
-
-	return IOEX_SIGNAL_END;
-}
-
-static enum ec_error_list ioex_set(const char *name, int value)
-{
-	enum ioex_signal signal = find_ioex_by_name(name);
-
-	if (!signal_is_ioex(signal))
-		return EC_ERROR_INVAL;
-
-	if (!(ioex_get_default_flags(signal) & GPIO_OUTPUT))
-		return EC_ERROR_INVAL;
-
-	return ioex_set_level(signal, value);
-}
-
-static int command_ioex_set(int argc, char **argv)
-{
-	char *e;
-	int v;
-
-	if (argc < 3)
-		return EC_ERROR_PARAM_COUNT;
-
-	v = strtoi(argv[2], &e, 0);
-	if (*e)
-		return EC_ERROR_PARAM2;
-
-	if (ioex_set(argv[1], v) != EC_SUCCESS)
-		return EC_ERROR_PARAM1;
-
-	return EC_SUCCESS;
-}
-DECLARE_CONSOLE_COMMAND(ioexset, command_ioex_set,
-			"name <0 | 1>",
-			"Set level of a IO expander IO");
-
-static int command_ioex_get(int argc, char **argv)
-{
-	enum ioex_signal signal;
-
-	/* If a signal is specified, print only that one */
-	if (argc == 2) {
-		signal = find_ioex_by_name(argv[1]);
-		if (!signal_is_ioex(signal))
-			return EC_ERROR_PARAM1;
-		print_ioex_info(signal);
-
-		return EC_SUCCESS;
-	}
-
-	/* Otherwise print them all */
-	for (signal = IOEX_SIGNAL_START; signal < IOEX_SIGNAL_END; signal++)
-		print_ioex_info(signal);
-
-	return EC_SUCCESS;
-}
-DECLARE_SAFE_CONSOLE_COMMAND(ioexget, command_ioex_get,
-			     "[name]",
-			     "Read level of IO expander pin(s)");