fit: Verify all configuration signatures

[u-boot] / common / usb_kbd.c

diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 137ec65e19a02e16d5dedbc8d149a600cf225ff7..8b2fccf9ca46eb0c1f56c61113c72cffa993c11e 100644 (file)
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -1,13 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Denis Peter, MPL AG Switzerland
  *
  * Part of this source has been derived from the Linux USB
  * project.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
+#include <console.h>
 #include <dm.h>
 #include <errno.h>
 #include <malloc.h>
@@ -198,7 +198,7 @@ static int usb_kbd_translate(struct usb_kbd_pdata *data, unsigned char scancode,
                }
        }
 
-       if ((scancode > 0x1d) && (scancode < 0x3a)) {
+       if ((scancode > 0x1d) && (scancode < 0x39)) {
                /* Shift pressed */
                if (modifier & (LEFT_SHIFT | RIGHT_SHIFT))
                        keycode = usb_kbd_numkey_shifted[scancode - 0x1e];
@@ -410,13 +410,13 @@ static int usb_kbd_probe_dev(struct usb_device *dev, unsigned int ifnum)
 
        iface = &dev->config.if_desc[ifnum];
 
-       if (iface->desc.bInterfaceClass != 3)
+       if (iface->desc.bInterfaceClass != USB_CLASS_HID)
                return 0;
 
-       if (iface->desc.bInterfaceSubClass != 1)
+       if (iface->desc.bInterfaceSubClass != USB_SUB_HID_BOOT)
                return 0;
 
-       if (iface->desc.bInterfaceProtocol != 1)
+       if (iface->desc.bInterfaceProtocol != USB_PROT_HID_KEYBOARD)
                return 0;
 
        if (iface->desc.bNumEndpoints != 1)
@@ -475,6 +475,9 @@ static int usb_kbd_probe_dev(struct usb_device *dev, unsigned int ifnum)
                                      USB_KBD_BOOT_REPORT_SIZE, data->new,
                                      data->intinterval);
        if (!data->intq) {
+#elif defined(CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP)
+       if (usb_get_report(dev, iface->desc.bInterfaceNumber,
+                          1, 0, data->new, USB_KBD_BOOT_REPORT_SIZE) < 0) {
 #else
        if (usb_submit_int_msg(dev, data->intpipe, data->new, data->intpktsize,
                               data->intinterval) < 0) {
@@ -511,8 +514,8 @@ static int probe_usb_keyboard(struct usb_device *dev)
        if (error)
                return error;
 
-       stdinname = getenv("stdin");
-#ifdef CONFIG_CONSOLE_MUX
+       stdinname = env_get("stdin");
+#if CONFIG_IS_ENABLED(CONSOLE_MUX)
        error = iomux_doenv(stdin, stdinname);
        if (error)
                return error;
@@ -540,35 +543,6 @@ int drv_usb_kbd_init(void)
        int error, i;
 
        debug("%s: Probing for keyboard\n", __func__);
-#ifdef CONFIG_DM_USB
-       /*
-        * TODO: We should add U_BOOT_USB_DEVICE() declarations to each USB
-        * keyboard driver and then most of this file can be removed.
-        */
-       struct udevice *bus;
-       struct uclass *uc;
-       int ret;
-
-       ret = uclass_get(UCLASS_USB, &uc);
-       if (ret)
-               return ret;
-       uclass_foreach_dev(bus, uc) {
-               for (i = 0; i < USB_MAX_DEVICE; i++) {
-                       struct usb_device *dev;
-
-                       dev = usb_get_dev_index(bus, i); /* get device */
-                       debug("i=%d, %p\n", i, dev);
-                       if (!dev)
-                               break; /* no more devices available */
-
-                       error = probe_usb_keyboard(dev);
-                       if (!error)
-                               return 1;
-                       if (error && error != -ENOENT)
-                               return error;
-               } /* for */
-       }
-#else
        /* Scan all USB Devices */
        for (i = 0; i < USB_MAX_DEVICE; i++) {
                struct usb_device *dev;
@@ -587,17 +561,15 @@ int drv_usb_kbd_init(void)
                if (error && error != -ENOENT)
                        return error;
        }
-#endif
 
        /* No USB Keyboard found */
        return -1;
 }
-#endif
 
 /* Deregister the keyboard. */
 int usb_kbd_deregister(int force)
 {
-#ifdef CONFIG_SYS_STDIO_DEREGISTER
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
        struct stdio_dev *dev;
        struct usb_device *usb_kbd_dev;
        struct usb_kbd_pdata *data;
@@ -608,8 +580,8 @@ int usb_kbd_deregister(int force)
                data = usb_kbd_dev->privptr;
                if (stdio_deregister_dev(dev, force) != 0)
                        return 1;
-#ifdef CONFIG_CONSOLE_MUX
-               if (iomux_doenv(stdin, getenv("stdin")) != 0)
+#if CONFIG_IS_ENABLED(CONSOLE_MUX)
+               if (iomux_doenv(stdin, env_get("stdin")) != 0)
                        return 1;
 #endif
 #ifdef CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE
@@ -625,15 +597,49 @@ int usb_kbd_deregister(int force)
 #endif
 }
 
+#endif
+
 #ifdef CONFIG_DM_USB
 
 static int usb_kbd_probe(struct udevice *dev)
 {
        struct usb_device *udev = dev_get_parent_priv(dev);
+
+       return probe_usb_keyboard(udev);
+}
+
+static int usb_kbd_remove(struct udevice *dev)
+{
+       struct usb_device *udev = dev_get_parent_priv(dev);
+       struct usb_kbd_pdata *data;
+       struct stdio_dev *sdev;
        int ret;
 
-       ret = probe_usb_keyboard(udev);
+       sdev = stdio_get_by_name(DEVNAME);
+       if (!sdev) {
+               ret = -ENXIO;
+               goto err;
+       }
+       data = udev->privptr;
+       if (stdio_deregister_dev(sdev, true)) {
+               ret = -EPERM;
+               goto err;
+       }
+#if CONFIG_IS_ENABLED(CONSOLE_MUX)
+       if (iomux_doenv(stdin, env_get("stdin"))) {
+               ret = -ENOLINK;
+               goto err;
+       }
+#endif
+#ifdef CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE
+       destroy_int_queue(udev, data->intq);
+#endif
+       free(data->new);
+       free(data);
 
+       return 0;
+err:
+       printf("%s: warning, ret=%d", __func__, ret);
        return ret;
 }
 
@@ -647,12 +653,7 @@ U_BOOT_DRIVER(usb_kbd) = {
        .id     = UCLASS_KEYBOARD,
        .of_match = usb_kbd_ids,
        .probe = usb_kbd_probe,
-};
-
-/* TODO(sjg@chromium.org): Move this into a common location */
-UCLASS_DRIVER(keyboard) = {
-       .id             = UCLASS_KEYBOARD,
-       .name           = "keyboard",
+       .remove = usb_kbd_remove,
 };
 
 static const struct usb_device_id kbd_id_table[] = {
@@ -661,8 +662,8 @@ static const struct usb_device_id kbd_id_table[] = {
                        USB_DEVICE_ID_MATCH_INT_SUBCLASS |
                        USB_DEVICE_ID_MATCH_INT_PROTOCOL,
                .bInterfaceClass = USB_CLASS_HID,
-               .bInterfaceSubClass = 1,
-               .bInterfaceProtocol = 1,
+               .bInterfaceSubClass = USB_SUB_HID_BOOT,
+               .bInterfaceProtocol = USB_PROT_HID_KEYBOARD,
        },
        { }             /* Terminating entry */
 };