All of lore.kernel.org
 help / color / mirror / Atom feed
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 4/7] usb: kbd: implement special keys
Date: Sat, 23 Nov 2019 18:15:21 +0100	[thread overview]
Message-ID: <20191123171524.156445-5-xypron.glpk@gmx.de> (raw)
In-Reply-To: <20191123171524.156445-1-xypron.glpk@gmx.de>

Provide support for F1-F12, Insert, Delete, Home, End, Page Up, Page Down.

As this leads to a size increase provide a customizing setting
CONFIG_USB_KEYBOARD_FN_KEYS.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
v4:
	reduce code size by avoiding string constants
v3:
	no change
v2:
	no change
---
 common/usb_kbd.c    | 42 ++++++++++++++++++++++++++++++++++++++++++
 drivers/usb/Kconfig |  6 ++++++
 2 files changed, 48 insertions(+)

diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index d177b97d67..d6b340bbe7 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -76,7 +76,11 @@ static const unsigned char usb_kbd_num_keypad[] = {
 };

 static const u8 usb_special_keys[] = {
+#ifdef CONFIG_USB_KEYBOARD_FN_KEYS
+	'2', 'H', '5', '3', 'F', '6', 'C', 'D', 'B', 'A'
+#else
 	'C', 'D', 'B', 'A'
+#endif
 };

 /*
@@ -233,6 +237,43 @@ static int usb_kbd_translate(struct usb_kbd_pdata *data, unsigned char scancode,
 		return 0;
 	}

+#ifdef CONFIG_USB_KEYBOARD_FN_KEYS
+	if (scancode < 0x3a || scancode > 0x52 ||
+	    scancode == 0x46 || scancode == 0x47)
+		return 1;
+
+	usb_kbd_put_queue(data, 0x1b);
+	if (scancode < 0x3e) {
+		/* F1 - F4 */
+		usb_kbd_put_queue(data, 0x4f);
+		usb_kbd_put_queue(data, scancode - 0x3a + 'P');
+		return 0;
+	}
+	usb_kbd_put_queue(data, '[');
+	if (scancode < 0x42) {
+		/* F5 - F8 */
+		usb_kbd_put_queue(data, '1');
+		if (scancode == 0x3e)
+			--scancode;
+		keycode = scancode - 0x3f + '7';
+	} else if (scancode < 0x49) {
+		/* F9 - F12 */
+		usb_kbd_put_queue(data, '2');
+		if (scancode > 0x43)
+			++scancode;
+		keycode = scancode - 0x42 + '0';
+	} else {
+		/*
+		 * INSERT, HOME, PAGE UP, DELETE, END, PAGE DOWN,
+		 * RIGHT, LEFT, DOWN, UP
+		 */
+		keycode = usb_special_keys[scancode - 0x49];
+	}
+	usb_kbd_put_queue(data, keycode);
+	if (scancode < 0x4f && scancode != 0x4a && scancode != 0x4d)
+		usb_kbd_put_queue(data, '~');
+	return 0;
+#else
 	/* Left, Right, Up, Down */
 	if (scancode > 0x4e && scancode < 0x53) {
 		usb_kbd_put_queue(data, 0x1b);
@@ -241,6 +282,7 @@ static int usb_kbd_translate(struct usb_kbd_pdata *data, unsigned char scancode,
 		return 0;
 	}
 	return 1;
+#endif /* CONFIG_USB_KEYBOARD_FN_KEYS */
 }

 static uint32_t usb_kbd_service_key(struct usb_device *dev, int i, int up)
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 9af78e8822..bea4a92b61 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -100,6 +100,12 @@ config USB_KEYBOARD

 if USB_KEYBOARD

+config USB_KEYBOARD_FN_KEYS
+	bool "USB keyboard function key support"
+	help
+	  Say Y here if you want support for keys F1 - F12, INS, HOME, DELETE,
+	  END, PAGE UP, and PAGE DOWN.
+
 choice
 	prompt "USB keyboard polling"
 	default SYS_USB_EVENT_POLL
--
2.24.0

  parent reply	other threads:[~2019-11-23 17:15 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-23 17:15 [U-Boot] [PATCH v4 0/7] usb: kbd: implement special keys Heinrich Schuchardt
2019-11-23 17:15 ` [U-Boot] [PATCH v4 1/7] usb: kbd: fix typo Heinrich Schuchardt
2019-11-23 17:15 ` [U-Boot] [PATCH v4 2/7] usb: kbd: signature of usb_kbd_put_queue() Heinrich Schuchardt
2019-11-23 17:15 ` [U-Boot] [PATCH v4 3/7] usb: kbd: simplify coding for arrow keys Heinrich Schuchardt
2019-11-23 17:15 ` Heinrich Schuchardt [this message]
2019-11-23 17:15 ` [U-Boot] [PATCH v4 5/7] usb: kbd: move USB_KBD_BOOT_REPORT_SIZE to usb.h Heinrich Schuchardt
2019-11-23 17:15 ` [U-Boot] [PATCH v4 6/7] dm: test: usb: rework keyboard test Heinrich Schuchardt
2019-11-23 17:15 ` [U-Boot] [PATCH v4 7/7] sandbox: enable USB_KEYBOARD_FN_KEYS Heinrich Schuchardt
2019-11-23 19:15 ` [U-Boot] [PATCH v4 0/7] usb: kbd: implement special keys Marek Vasut
2019-12-27 16:41   ` Simon Glass
2019-12-27 18:21     ` Heinrich Schuchardt
2019-12-28  2:26       ` Simon Glass
2019-12-28  4:54         ` Heinrich Schuchardt
2019-12-30  1:21           ` Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191123171524.156445-5-xypron.glpk@gmx.de \
    --to=xypron.glpk@gmx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.