diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-28 07:34:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-28 07:34:21 -0500 |
| commit | c4f697b291563adbde30ad4af66cb170e708dde4 (patch) | |
| tree | 36e3ffc5daaacad06358ede83c3f39d146928567 /drivers | |
| parent | 089612da337dfd60afb3d3def79b872cc98f6dd5 (diff) | |
| parent | dbcbdad92caf4b42a6279da6e65180532bc45620 (diff) | |
| download | u-boot-c4f697b291563adbde30ad4af66cb170e708dde4.tar.gz u-boot-c4f697b291563adbde30ad4af66cb170e708dde4.tar.xz u-boot-c4f697b291563adbde30ad4af66cb170e708dde4.zip | |
Merge git://git.denx.de/u-boot-usb
- USB keyboard improvements
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/usb/emul/sandbox_keyb.c | 27 |
2 files changed, 23 insertions, 10 deletions
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 diff --git a/drivers/usb/emul/sandbox_keyb.c b/drivers/usb/emul/sandbox_keyb.c index dc43880d27..32bc9a1698 100644 --- a/drivers/usb/emul/sandbox_keyb.c +++ b/drivers/usb/emul/sandbox_keyb.c @@ -155,14 +155,20 @@ static void *keyb_desc_list[] = { NULL, }; -int sandbox_usb_keyb_add_string(struct udevice *dev, const char *str) +/** + * sandbox_usb_keyb_add_string() - provide a USB scancode buffer + * + * @dev: the keyboard emulation device + * @scancode: scancode buffer with USB_KBD_BOOT_REPORT_SIZE bytes + */ +int sandbox_usb_keyb_add_string(struct udevice *dev, + const char scancode[USB_KBD_BOOT_REPORT_SIZE]) { struct sandbox_keyb_priv *priv = dev_get_priv(dev); - int len, ret; + int ret; - len = strlen(str); - ret = membuff_put(&priv->in, str, len); - if (ret != len) + ret = membuff_put(&priv->in, scancode, USB_KBD_BOOT_REPORT_SIZE); + if (ret != USB_KBD_BOOT_REPORT_SIZE) return -ENOSPC; return 0; @@ -183,12 +189,12 @@ static int sandbox_keyb_interrupt(struct udevice *dev, struct usb_device *udev, { struct sandbox_keyb_priv *priv = dev_get_priv(dev); uint8_t *data = buffer; - int ch; memset(data, '\0', length); - ch = membuff_getbyte(&priv->in); - if (ch != -1) - data[2] = 4 + ch - 'a'; + if (length < USB_KBD_BOOT_REPORT_SIZE) + return 0; + + membuff_get(&priv->in, buffer, USB_KBD_BOOT_REPORT_SIZE); return 0; } @@ -213,7 +219,8 @@ static int sandbox_keyb_probe(struct udevice *dev) { struct sandbox_keyb_priv *priv = dev_get_priv(dev); - return membuff_new(&priv->in, 256); + /* Provide an 80 character keyboard buffer */ + return membuff_new(&priv->in, 80 * USB_KBD_BOOT_REPORT_SIZE); } static const struct dm_usb_ops sandbox_usb_keyb_ops = { |