From nobody Sun Apr 12 18:10:15 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftz9400PFz6YT1m for ; Sun, 12 Apr 2026 18:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftz934YZyz3Scc for ; Sun, 12 Apr 2026 18:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776017415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=410Wmea5CFDhcjE4knFm6kvXy19QbH+P/pIKAmP6vIk=; b=AiwO4dgUhbeE3vWAYTtOV5vCuZzwUcPtZlG4MfOCd75tkGR9fYP/b1zAGSWswJl0jAgqPP 2b/Wea0h3sx4ysw+rPG37cQ1X3vuzdyPGDCRbmULISzVv1S0VEMxLelbJQ/5a5bIaAgGfD 6I8ytick8EKvewg6r9xXe2iKYh4VVDbkNFXKYIlhWmFfjmlXhHydFO9zNzkBOy2lYlv0Gx LlWVEaZUrB6S14ga+DQuUaD7MMeLacZgUypE5wl0SuZ2hVrwIfcG3dQqy7xcLnr0w2yH7B EfODqV5woIL6talRvUzBjRmTJdM8DcJFYhkhgrCcJz5m6YKHmuAdauG+y0jOpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776017415; a=rsa-sha256; cv=none; b=rNR5s7k2QkAAV0uGid+yfxM5hrhT4nZBveMkf7L/QfmiA2ae2P0w82h9bN4oap3mc4Gj9N WZo/1Ogx5KH64usxIpAx9GTYbBlbCkgBHuih1p+/a/UAXl3/CVeMa7/HRN+Bz8VCbrwGGL 7CKSJl7yY4+lI37DH65JxUNM6QGyxBb82oVOppX0hbGyf4dLUln5JpOWvd9RWub6Ke01LK 79AKfNmQ0r9NjTGSx0kw272gg4DnMM3ae0KBMoZstaadkZgaQNiIHew872nF/G5EnvmRhy VKGmY1DAY04q9o6DTzKU8t8kqt1L0D9PhPu56hHaJ+rcjT3/hEJ2YxWdhpsWXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776017415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=410Wmea5CFDhcjE4knFm6kvXy19QbH+P/pIKAmP6vIk=; b=JQ8XaB2X/13vesiJHjmvHISqR+KTQzxyXmYNOk8YfvsNaUogsiivVGcY/zlY+gS75dj8Bi E4z+sW0kNbdSxhhyTjXF2CPZ7XkZz7ARZNsXvkdlTBG/hlBBVqyhbKXMSQxDWYGHQdy6CA 8KKxBxfFoqVYLo6qHspKkhviwc3t8qpmc1fWxiHk42R+pmJfatRdoJmpg4qe8PGxOoxdbZ Hk0rh8scOAG4ypMHZ3mVGgm1JOp3z+bECkvxgmObyItVhwhdcXbrLHkTmS6ChkfIHve0wt E6zedhuLBKSvRe9xePva/fQPUEji9kal+GEGh6d5MPKedfnSj/l7Jbgx0W7PRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftz933NrnzCGs for ; Sun, 12 Apr 2026 18:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 380a2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 18:10:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 817e6995a19c - main - wsp(4): Make evdev interface operational if sysmouse one is not opened List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 817e6995a19cb6f35851d0191bb1099a73d98bb9 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 18:10:15 +0000 Message-Id: <69dbe007.380a2.114a0c36@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=817e6995a19cb6f35851d0191bb1099a73d98bb9 commit 817e6995a19cb6f35851d0191bb1099a73d98bb9 Author: Vladimir Kondratyev AuthorDate: 2026-04-12 18:09:23 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-04-12 18:09:23 +0000 wsp(4): Make evdev interface operational if sysmouse one is not opened Before this change evdev interface sent only copy of data sent through the sysmouse interface. It worked as /dev/wsp0 device node was automatcaly opened by devd(8) with starting of moused(8). Starting with 15.0 moused(8) does not open sysmouse interface by default thus making wsp(4) device dysfunctional. Fix it with adding extra checks of interfaces state. MFC after: 1 week --- sys/dev/usb/input/wsp.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/input/wsp.c b/sys/dev/usb/input/wsp.c index a78fac49491a..2d7e3b796b17 100644 --- a/sys/dev/usb/input/wsp.c +++ b/sys/dev/usb/input/wsp.c @@ -1068,6 +1068,10 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error) if (evdev_rcpt_mask & EVDEV_RCPT_HW_MOUSE) { evdev_push_key(sc->sc_evdev, BTN_LEFT, ibt); evdev_sync(sc->sc_evdev); + if ((sc->sc_fflags & FREAD) == 0 || + usb_fifo_put_bytes_max( + sc->sc_fifo.fp[USB_FIFO_RX]) == 0) + goto tr_setup; } #endif sc->sc_status.flags &= ~MOUSE_POSCHANGED; @@ -1357,7 +1361,12 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error) case USB_ST_SETUP: tr_setup: /* check if we can put more data into the FIFO */ - if (usb_fifo_put_bytes_max( + if ( +#ifdef EVDEV_SUPPORT + ((evdev_rcpt_mask & EVDEV_RCPT_HW_MOUSE) != 0 && + (sc->sc_state & WSP_EVDEV_OPENED) != 0) || +#endif + usb_fifo_put_bytes_max( sc->sc_fifo.fp[USB_FIFO_RX]) != 0) { usbd_xfer_set_frame_len(xfer, 0, sc->tp_datalen);