From nobody Wed Apr 22 20:08:16 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 4g19Jd2sv9z6bDsC for ; Wed, 22 Apr 2026 20:08:17 +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 4g19Jc6KgCz3Lxg for ; Wed, 22 Apr 2026 20:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776888496; 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=YLINXCuT0Zzg2Gk9DvbQ8QzpqSe0EdpxiDkBDFNivGw=; b=uwqyCXVXkYp56eyQLTJEJBJ59w+5PLOcJp/GiVdXEUzaq3Mv21QDIrznwwWItvtyp/N1Hc avd7mMr+Z4e2JGoJKvwrmOpkfxMPjcqD6ZHL6XdiTbtHtpzknmXVijUcFvXysm9tvuDE4j 2yi2EgJQyfREsUNKdzPZ+UgZQRl7bk2LZHwKvoc6jrG5/eDPquZD78LXGpNZL99//LWXT+ ikuqdjsYRYEIFR3yucExHK860g3LZji1a8f+KkmQBGjg1dM1iBYx7M1zMtu14pwzsrgYpj 38dxy0gHibMjKXgqdbRS45DRSDiiLpR21ougVGcz3GE+ZX3ACst3NUUZc0h7jQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776888496; a=rsa-sha256; cv=none; b=nC4lPg0YksBuPlg5cFelV6nKaI6+84DiKnGfNPj8zC3/sMUJuAu/mIrO9Iy11jIPjaNzb+ 43F4KKTRNqGoIxswAdqZq51V85Ug5K+w5ucYlCRGRLwhfJ2A7pbBtb0N6x85a7zJ94oFxo S4S4O0Uu++8dQtBeVbidagro5aTx5XcWCQbf+EmQ4fDL7UbkLSN7hQTrCQQQINtdlG2Gm+ +dwtg2kwNv2sRIckIsgEqcLL4EwF4bjxVgJWzbxW9eX7146u4Yjr4XL2gZf+p9s2r65TGm hjOJxkvF7ds3i6gFpvr+Pb2Zy2aRNBZEb7aPIeJhdYoB+IQ+tYtfT84SV/AVGw== 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=1776888496; 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=YLINXCuT0Zzg2Gk9DvbQ8QzpqSe0EdpxiDkBDFNivGw=; b=cfqdiA42O0TnlB8mQiJ4aP9NsUW3GYbK7rZj18P6+zAwKckYftagQFV1PSxpev6GUcs773 TINOR2hmK2lp6PKvDbpLJ3WdsBT+MovGAWBOrSiQwS+t7KOdIfn3E65Ft2KfVJgj++o9S0 Mul6U15nYRJbXX7QJOl/ZKbCKfyxsR02OgdHjFrjViDbuN6wdSvdDkcjPNgoPJAXm7PPNL L8Ov2gSPkc+naUntypz2lPKiI2OIxBp4AI+/yaeKcD8HhPd1gegth6hnxKPd8dJlusVhVn n/BipbFd2RK1xQRS+Pw+DX9kk+DxuQY8/XzDLO/1qS1woopQFtU+kzkihb/CsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g19Jc5r40zlxn for ; Wed, 22 Apr 2026 20:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21f71 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 20:08:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: cc6016af8461 - stable/15 - wsp(4): Do not handle pressure on non-ForceTouch devices 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: cc6016af846104b0ad0f4cd4f6e1d2cec9f89e5e Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 20:08:16 +0000 Message-Id: <69e92ab0.21f71.2c8e3100@gitrepo.freebsd.org> The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=cc6016af846104b0ad0f4cd4f6e1d2cec9f89e5e commit cc6016af846104b0ad0f4cd4f6e1d2cec9f89e5e Author: Vladimir Kondratyev AuthorDate: 2026-04-12 18:09:23 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-04-22 19:59:04 +0000 wsp(4): Do not handle pressure on non-ForceTouch devices They always report it value as zero breaking pressure-driven drivers like moused(8) and xf86-input-synaptics. MFC after: 1 week (cherry picked from commit dc5a94962e21a267550a2c20a0c4707d06843942) --- sys/dev/usb/input/wsp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/input/wsp.c b/sys/dev/usb/input/wsp.c index f78d64f69c08..a78fac49491a 100644 --- a/sys/dev/usb/input/wsp.c +++ b/sys/dev/usb/input/wsp.c @@ -231,6 +231,7 @@ enum tp_type { /* list of device capability bits */ #define HAS_INTEGRATED_BUTTON 1 +#define SUPPORTS_FORCETOUCH 2 /* trackpad finger data block size */ #define FSIZE_TYPE1 (14 * 2) @@ -285,7 +286,7 @@ struct wsp_tp { .delta = 0, }, [TYPE4] = { - .caps = HAS_INTEGRATED_BUTTON, + .caps = HAS_INTEGRATED_BUTTON | SUPPORTS_FORCETOUCH, .button = BUTTON_TYPE4, .offset = FINGER_TYPE4, .fsize = FSIZE_TYPE4, @@ -896,7 +897,8 @@ wsp_attach(device_t dev) WSP_SUPPORT_ABS(sc->sc_evdev, ABS_MT_POSITION_X, sc->sc_params->x); WSP_SUPPORT_ABS(sc->sc_evdev, ABS_MT_POSITION_Y, sc->sc_params->y); /* finger pressure */ - WSP_SUPPORT_ABS(sc->sc_evdev, ABS_MT_PRESSURE, sc->sc_params->p); + if ((sc->sc_params->tp->caps & SUPPORTS_FORCETOUCH) != 0) + WSP_SUPPORT_ABS(sc->sc_evdev, ABS_MT_PRESSURE, sc->sc_params->p); /* finger major/minor axis */ WSP_SUPPORT_ABS(sc->sc_evdev, ABS_MT_TOUCH_MAJOR, sc->sc_params->w); WSP_SUPPORT_ABS(sc->sc_evdev, ABS_MT_TOUCH_MINOR, sc->sc_params->w);