[coreboot-gerrit] Change in coreboot[master]: libpayload/i8042: Add API to get/set kbd translation state

[Nico Huber (Code Review)]

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47589 )

Change subject: libpayload/i8042: Add API to get/set kbd translation state
......................................................................

libpayload/i8042: Add API to get/set kbd translation state

Change-Id: I49aa1c244cb60ea290df102f06f641c765f59fa5
Signed-off-by: Nico Huber 
---
M payloads/libpayload/drivers/i8042/i8042.c
M payloads/libpayload/include/libpayload.h
2 files changed, 55 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/47589/1

diff --git a/payloads/libpayload/drivers/i8042/i8042.c b/payloads/libpayload/drivers/i8042/i8042.c
index 84bad55..7dbc6e7 100644
--- a/payloads/libpayload/drivers/i8042/i8042.c
+++ b/payloads/libpayload/drivers/i8042/i8042.c
@@ -28,6 +28,7 @@

#include <libpayload-config.h>
 #include <libpayload.h>
+#include <stdbool.h>
 #include <stddef.h>

#include "i8042.h"
@@ -319,6 +320,24 @@
 }

/**
+ * Send command & data to keyboard controller.
+ *
+ * @param cmd: The command to be send.
+ * @param data: The data to be send.
+ * Returns 0 on success, -1 on failure.
+ */
+static int i8042_cmd_with_data(const u8 cmd, const u8 data)
+{
+	const int ret = i8042_cmd(cmd);
+	if (ret != 0)
+		return ret;
+
+	i8042_write_data(data);
+
+	return ret;
+}
+
+/**
  * Probe for keyboard controller data and queue it.
  */
 static void i8042_data_poll(void)
@@ -408,3 +427,36 @@

return (retries <= 0) ? -1 : i8042_read_data_aux();
 }
+
+/**
+ * Get the keyboard scancode translation state.
+ *
+ * Returns: -1 on timeout, 1 if the controller translates
+ *          scancode set #2 to #1, and 0 if not.
+ */
+int i8042_get_kbd_translation(void)
+{
+	const int cfg = i8042_cmd_with_response(I8042_CMD_RD_CMD_BYTE);
+	if (cfg < 0)
+		return cfg;
+
+	return !!(cfg & I8042_CMD_BYTE_XLATE);
+}
+
+/**
+ * Sets the keyboard scancode translation state.
+ *
+ * Returns: -1 on timeout, 0 otherwise.
+ */
+int i8042_set_kbd_translation(const bool xlate)
+{
+	int cfg = i8042_cmd_with_response(I8042_CMD_RD_CMD_BYTE);
+	if (cfg < 0)
+		return cfg;
+
+	if (xlate)
+		cfg |= I8042_CMD_BYTE_XLATE;
+	else
+		cfg &= ~I8042_CMD_BYTE_XLATE;
+	return i8042_cmd_with_data(I8042_CMD_WR_CMD_BYTE, cfg);
+}
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index f206fea..371471f 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -238,6 +238,9 @@
 int i8042_wait_read_ps2(void);
 int i8042_wait_read_aux(void);

+int i8042_get_kbd_translation(void);
+int i8042_set_kbd_translation(bool xlate);
+
 /** @} */

/**