d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ums(4): Do not stop USB xfers on FIFO close when evdev is still active

Browse Source 
This fixes lose of evdev events after moused has been killed.

While here use bitwise operations for UMS_EVDEV_OPENED flag.

Reviewed by:	hselasky
MFC after:	2 weeks
Differential revision:	https://reviews.freebsd.org/D30342
This commit is contained in:
Vladimir Kondratyev 2021-05-24 01:38:53 +03:00
parent a660948b7b
commit 05ab03a317
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/usb/input/ums.c
View File

@ -380,7 +380,7 @@ ums_intr_callback(struct usb_xfer *xfer, usb_error_t error)
/* check if we can put more data into the FIFO */ /* check if we can put more data into the FIFO */
if (usb_fifo_put_bytes_max(sc->sc_fifo.fp[USB_FIFO_RX]) == 0) { if (usb_fifo_put_bytes_max(sc->sc_fifo.fp[USB_FIFO_RX]) == 0) {
#ifdef EVDEV_SUPPORT #ifdef EVDEV_SUPPORT
if (sc->sc_evflags == 0) if ((sc->sc_evflags & UMS_EVDEV_OPENED) == 0)
break; break;
#else #else
break; break;
@ -858,7 +858,10 @@ ums_fifo_stop_read(struct usb_fifo *fifo)
{ {
struct ums_softc *sc = usb_fifo_softc(fifo); struct ums_softc *sc = usb_fifo_softc(fifo);
ums_stop_rx(sc); #ifdef EVDEV_SUPPORT
if ((sc->sc_evflags & UMS_EVDEV_OPENED) == 0)
#endif
ums_stop_rx(sc);
} }
#if ((MOUSE_SYS_PACKETSIZE != 8) || \ #if ((MOUSE_SYS_PACKETSIZE != 8) || \
@ -945,7 +948,7 @@ ums_ev_open(struct evdev_dev *evdev)
mtx_assert(&sc->sc_mtx, MA_OWNED); mtx_assert(&sc->sc_mtx, MA_OWNED);
sc->sc_evflags = UMS_EVDEV_OPENED; sc->sc_evflags |= UMS_EVDEV_OPENED;
if (sc->sc_fflags == 0) { if (sc->sc_fflags == 0) {
ums_reset(sc); ums_reset(sc);
@ -962,7 +965,7 @@ ums_ev_close(struct evdev_dev *evdev)
mtx_assert(&sc->sc_mtx, MA_OWNED); mtx_assert(&sc->sc_mtx, MA_OWNED);
sc->sc_evflags = 0; sc->sc_evflags &= ~UMS_EVDEV_OPENED;
if (sc->sc_fflags == 0) if (sc->sc_fflags == 0)
ums_stop_rx(sc); ums_stop_rx(sc);
@ -984,7 +987,7 @@ ums_fifo_open(struct usb_fifo *fifo, int fflags)
/* check for first open */ /* check for first open */
#ifdef EVDEV_SUPPORT #ifdef EVDEV_SUPPORT
if (sc->sc_fflags == 0 && sc->sc_evflags == 0) if (sc->sc_fflags == 0 && (sc->sc_evflags & UMS_EVDEV_OPENED) == 0)
ums_reset(sc); ums_reset(sc);
#else #else
if (sc->sc_fflags == 0) if (sc->sc_fflags == 0)