From nobody Wed Apr 22 20:08:17 2026 X-Original-To: dev-commits-src-all@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 4g19Jf48sYz6bDj9 for ; Wed, 22 Apr 2026 20:08:18 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g19Jf03D6z3MB0 for ; Wed, 22 Apr 2026 20:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776888498; 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=HogNJI0FRjnH03Sjre43xxeMgBkWsFiFd4S6L1KjXaY=; b=jYdjOhO7M8+XqN3gSpWedk/ed+LVgrBXWHtU1hCA1wx3uxp0UEqZlO5TwsAVhgX9s/u0cl y++pc7mgRiMpJlwafvH+Ch0h7FfMQyO3Bdd6gjy9R1x4+BQ4i7cKEIUV+AnXlZG9DTCnnc SwmW68Ado1YsfxuAXOGODXVtV3hHPGzDuNF5otKT9rHgkvdC1z2/xYn9I9o1y2noJtuCGM i4W7kCIDNi0lGrcGp4sb18SY532NB3nUXnw94sJu1KQJdlknssAJJDZMoqmCbs0SlnN8oj YSBSo7jI1uJdLdaQhHG4vNEq+LQLzjRMcCuBaJsNTzTWvKZbdbFHjIbgVfbXQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776888498; a=rsa-sha256; cv=none; b=hi9qH/uvJ1WODt0wFCOsev0zMWhIy/9QhfWwWqkq0qFNdhdRjBw3T7gdy32Jlq/TNwUfEl 7sDi86a2c2aB56gKHlEidPmftjwI20qJW+EjnsO+qWFXJrWmKNgTpCCxBB3CAeYJH33ETf XzW20iXEaC6KK1abPjwblwIezdBtUukvzLg5vaCmUv2W8oIynvPPgYM/Ux5VWY7otAZEV0 1zHDC5BLYSdbKg+g7B4gTxfTenP0PpjI+ci25D1dU3y+vqIHYC9TBtY0vi4IBXvwbZSBfm H+LkyNTkBjim6pBntTYemETDr8id26i0ZEXsbht4LhLqRizEMqX7yQ2TsdzSyQ== 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=1776888498; 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=HogNJI0FRjnH03Sjre43xxeMgBkWsFiFd4S6L1KjXaY=; b=lsP8rIIgL7FTWwIZYAtAB415Fm0huW2fPuVPa3psB+nUNYL29PbSN+0yEMP8K+CYtZie97 fPK/GZebli9UiaGjiYHCfPgc7UAMuJoXBTnqSsAJMa3hNkklvyaniUYL5Wr0K8UcBNI1z2 jxJyY0p06Wa2BKNC4xYW8E2UWPJi0S3p/lvzVGqRA68i4Eprt+Nr0K/j3BgpUx9jLmkmVy 0VXVMwkGgmnhVoZ3QgA87xAe82LFg0rivXN3KgnreR7tNn6B1Y2ACgPcsOsASfTWzBwqsF KlDvA4qmMGkZ8gxJNskQdelcMBgCKTSrFF3D1b73lyHOqGPD5qo4mf21dbB6Tg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g19Jd6j8Czl13 for ; Wed, 22 Apr 2026 20:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22900 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 20:08:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 6d00a0e09aaa - stable/15 - wsp(4): Make evdev interface operational if sysmouse one is not opened List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 6d00a0e09aaafb53a37935fe98938b1783234be0 Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 20:08:17 +0000 Message-Id: <69e92ab1.22900.2643b817@gitrepo.freebsd.org> The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=6d00a0e09aaafb53a37935fe98938b1783234be0 commit 6d00a0e09aaafb53a37935fe98938b1783234be0 Author: Vladimir Kondratyev AuthorDate: 2026-04-12 18:09:23 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-04-22 19:59:04 +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 (cherry picked from commit 817e6995a19cb6f35851d0191bb1099a73d98bb9) --- 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);