summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--payloads/libpayload/drivers/i8042/keyboard.c3
-rw-r--r--payloads/libpayload/drivers/serial/8250.c3
-rw-r--r--payloads/libpayload/drivers/serial/ipq40xx.c1
-rw-r--r--payloads/libpayload/drivers/serial/ipq806x.c1
-rw-r--r--payloads/libpayload/drivers/serial/s5p.c3
-rw-r--r--payloads/libpayload/include/libpayload.h3
6 files changed, 11 insertions, 3 deletions
diff --git a/payloads/libpayload/drivers/i8042/keyboard.c b/payloads/libpayload/drivers/i8042/keyboard.c
index 1035bf2791..42431c3689 100644
--- a/payloads/libpayload/drivers/i8042/keyboard.c
+++ b/payloads/libpayload/drivers/i8042/keyboard.c
@@ -296,7 +296,8 @@ int keyboard_set_layout(char *country)
static struct console_input_driver cons = {
.havekey = keyboard_havechar,
- .getchar = keyboard_getchar
+ .getchar = keyboard_getchar,
+ .input_type = CONSOLE_INPUT_TYPE_EC,
};
void keyboard_init(void)
diff --git a/payloads/libpayload/drivers/serial/8250.c b/payloads/libpayload/drivers/serial/8250.c
index f503bdb124..9502d4b147 100644
--- a/payloads/libpayload/drivers/serial/8250.c
+++ b/payloads/libpayload/drivers/serial/8250.c
@@ -98,7 +98,8 @@ static void serial_hardware_init(int speed, int word_bits,
static struct console_input_driver consin = {
.havekey = &serial_havechar,
- .getchar = &serial_getchar
+ .getchar = &serial_getchar,
+ .input_type = CONSOLE_INPUT_TYPE_UART,
};
static struct console_output_driver consout = {
diff --git a/payloads/libpayload/drivers/serial/ipq40xx.c b/payloads/libpayload/drivers/serial/ipq40xx.c
index 52d71b8ac8..7656ad73e0 100644
--- a/payloads/libpayload/drivers/serial/ipq40xx.c
+++ b/payloads/libpayload/drivers/serial/ipq40xx.c
@@ -560,6 +560,7 @@ void serial_console_init(void)
consin.havekey = serial_havechar;
consin.getchar = serial_getchar;
+ consin.input_type = CONSOLE_INPUT_TYPE_UART;
consout.putchar = serial_putchar;
diff --git a/payloads/libpayload/drivers/serial/ipq806x.c b/payloads/libpayload/drivers/serial/ipq806x.c
index 912893d7e2..183ada6563 100644
--- a/payloads/libpayload/drivers/serial/ipq806x.c
+++ b/payloads/libpayload/drivers/serial/ipq806x.c
@@ -352,6 +352,7 @@ void serial_console_init(void)
consin.havekey = serial_havechar;
consin.getchar = serial_getchar;
+ consin.input_type = CONSOLE_INPUT_TYPE_UART;
consout.putchar = serial_putchar;
diff --git a/payloads/libpayload/drivers/serial/s5p.c b/payloads/libpayload/drivers/serial/s5p.c
index 1d23352ec4..6ca5dc4717 100644
--- a/payloads/libpayload/drivers/serial/s5p.c
+++ b/payloads/libpayload/drivers/serial/s5p.c
@@ -84,7 +84,8 @@ static struct console_output_driver s5p_serial_output =
static struct console_input_driver s5p_serial_input =
{
.havekey = &serial_havechar,
- .getchar = &serial_getchar
+ .getchar = &serial_getchar,
+ .input_type = CONSOLE_INPUT_TYPE_UART,
};
void serial_init(void)
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index 3a84b3b038..a578d41f28 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -350,6 +350,9 @@ int set_option_from_string(const struct nvram_accessor *nvram, struct cb_cmos_op
typedef enum {
CONSOLE_INPUT_TYPE_UNKNOWN = 0,
CONSOLE_INPUT_TYPE_USB,
+ CONSOLE_INPUT_TYPE_EC,
+ CONSOLE_INPUT_TYPE_UART,
+ CONSOLE_INPUT_TYPE_GPIO,
} console_input_type;
void console_init(void);