Date: Fri, 14 Feb 2020 00:29:21 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357898 - head/sys/dev/usb/input Message-ID: <202002140029.01E0TLps039395@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Fri Feb 14 00:29:21 2020 New Revision: 357898 URL: https://svnweb.freebsd.org/changeset/base/357898 Log: Exclude modifier keys from keyboard repeat logic. This restores USB keyboard driver behaviour prior to r357861. Requested by: jkim@ MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/dev/usb/input/ukbd.c Modified: head/sys/dev/usb/input/ukbd.c ============================================================================== --- head/sys/dev/usb/input/ukbd.c Fri Feb 14 00:13:23 2020 (r357897) +++ head/sys/dev/usb/input/ukbd.c Fri Feb 14 00:29:21 2020 (r357898) @@ -347,6 +347,13 @@ ukbd_any_key_valid(struct ukbd_softc *sc) return (ret); } +static bool +ukbd_is_modifier_key(uint32_t key) +{ + + return (key >= 0xe0 && key <= 0xe7); +} + static void ukbd_start_timer(struct ukbd_softc *sc) { @@ -488,12 +495,9 @@ ukbd_interrupt(struct ukbd_softc *sc) { const uint32_t now = sc->sc_time_ms; unsigned key; - bool old_keys; UKBD_LOCK_ASSERT(); - old_keys = ukbd_any_key_pressed(sc); - /* Check for key changes */ for (key = 0; key != UKBD_NKEYCODE; key++) { const uint64_t mask = 1ULL << (key % 64); @@ -514,6 +518,19 @@ ukbd_interrupt(struct ukbd_softc *sc) } else { ukbd_put_key(sc, key | KEY_PRESS); + if (ukbd_is_modifier_key(key)) + continue; + + /* + * Check for first new key and set + * initial delay and [re]start timer: + */ + if (sc->sc_repeat_key == 0) { + sc->sc_co_basetime = sbinuptime(); + sc->sc_delay = sc->sc_kbd.kb_delay1; + ukbd_start_timer(sc); + } + /* set repeat time for last key */ sc->sc_repeat_time = now + sc->sc_kbd.kb_delay1; sc->sc_repeat_key = key; @@ -533,13 +550,6 @@ ukbd_interrupt(struct ukbd_softc *sc) ukbd_put_key(sc, sc->sc_repeat_key | KEY_PRESS); sc->sc_repeat_time = now + sc->sc_kbd.kb_delay2; } - } - - /* check for first new key and set initial delay and [re]start timer */ - if (old_keys == false && ukbd_any_key_pressed(sc) == true) { - sc->sc_co_basetime = sbinuptime(); - sc->sc_delay = sc->sc_kbd.kb_delay1; - ukbd_start_timer(sc); } /* wakeup keyboard system */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002140029.01E0TLps039395>