From nobody Fri Mar 07 17:55:23 2025 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 4Z8Yq01Py2z5pvR5; Fri, 07 Mar 2025 17:55:24 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z8Ypz3dB8z3YQb; Fri, 07 Mar 2025 17:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741370123; 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=gL+4Jnqu9ZGJ1vm9IMX0493wuzXWauzNfUdAnqr9q4I=; b=vAWuflyByRoRlgfsvk+XAVC28wXfcp949IKgrPKPVV2cLM3Hfa9N6j/LfHAdfsThiSKD8h s86yP4aNEw9bxjka4cd4s6LUKhfq7oBpPFeD9qfpJTU7cYmB+goidWYJfar+PcmFY96uuj 1W7mb79lWq5Rl3Z5zmSsCFUTvJJDbok2cMffVNPx0Z8Q/JEk6PxGx0y+M1aXvDMD6H+l7P ipNYOFEjtB6vAI00ln1r1nvaGEOeVtQFz6wqyur+4SBbVuRwOnZ1NE8GnPUKu8c0IHbFxa 0kscj8+sFvyeZuePhcklrxpuup+ck6ztQhZzv+3r7Tt7ZGGf/rO0rQw5XuVCIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741370123; a=rsa-sha256; cv=none; b=N/tRMdFM6IHU7xUliwO2UlQVl8p55lWdN6LZAbZXbubk9DcCMPP/HwBJ+4TDDNWALN4ECp +hz5PzTdUrWKZv1QaairvWFDLHCmHS/J7HAqREUo98Cg8a0O5ok9QlVHcIiHtwlnloWq2o 73y3Ahl/8xGR+ny335M9V2vxU/GeUzsiAOQUHnivSLl0Qo+Pi16NpJXnOH8H6HaYVgmYgL ym+AQgMDxs7CiSEg7d5OUNgosfrPOnjcMUmdhIKBIBJhpdZQY3/LeyxTeBsHURY0XCBn7e LBab2CBv1WxqipYL9DUIRDgP73aKgUCHUVDDMlPKeWH7svo1w9Qs5jHwHg78rg== 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=1741370123; 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=gL+4Jnqu9ZGJ1vm9IMX0493wuzXWauzNfUdAnqr9q4I=; b=ajxfvAUe7yJdllur0GWKwClCyMyjQHrdLcoNrXsKz1CsqawV/U7n3IvvaYk0FDF30av0Ko YwoA1kkUioCI3htTT1VNgGnYzHF0DpZGI8sirC2FBAMstG7hmZM/Z8QRMOr82kxVC0xSSD V18ZVwOuZtLVSl0nMnujEtrYf1PjngpocuzTAiexKwXza/A2LIOoaKuIHDb7xly45EgxcO vosfWxr3+9aTQtZGP3Pdzp+k6lM9smCWY/OyrygiA0Dk5uGErDuY2ZgxPMJmpGIADtMAlY VXDk5Duo+jr4PHKKIZYL4oG53S4xkZAVQaNLI7IjDT+NcgkAhuvm9K2RneTB8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z8Ypz33kBzngL; Fri, 07 Mar 2025 17:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 527HtNPC083620; Fri, 7 Mar 2025 17:55:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 527HtN0g083617; Fri, 7 Mar 2025 17:55:23 GMT (envelope-from git) Date: Fri, 7 Mar 2025 17:55:23 GMT Message-Id: <202503071755.527HtN0g083617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: e381dabcc580 - main - wsp: Rename max_finger_area sysctl to max_finger_diameter 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: e381dabcc58095d9be135b1027613cbf77a1ba7f Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=e381dabcc58095d9be135b1027613cbf77a1ba7f commit e381dabcc58095d9be135b1027613cbf77a1ba7f Author: Joshua Rogers AuthorDate: 2025-03-07 17:53:35 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-03-07 17:53:35 +0000 wsp: Rename max_finger_area sysctl to max_finger_diameter The value of this sysctl is not an area, but a maximum diameter. Signed-off-by: Joshua Rogers --- share/man/man4/wsp.4 | 4 ++-- sys/dev/usb/input/wsp.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/share/man/man4/wsp.4 b/share/man/man4/wsp.4 index de2c121784d4..9fcec5133830 100644 --- a/share/man/man4/wsp.4 +++ b/share/man/man4/wsp.4 @@ -107,8 +107,8 @@ Enables movement on the trackpad follow a partially-released left-click. Default is 1 (enabled). .El .Bl -tag -width indent -.It Va hw.usb.wsp.max_finger_area -Specifies the maximum area on the trackpad which is registered as a +.It Va hw.usb.wsp.max_finger_diameter +Specifies the maximum finger diameter on the trackpad that is registered as a finger (a lower value is used for palm detection). Default is 1900. .El .Bl -tag -width indent diff --git a/sys/dev/usb/input/wsp.c b/sys/dev/usb/input/wsp.c index 55289aa40b17..b9311ffd6c2d 100644 --- a/sys/dev/usb/input/wsp.c +++ b/sys/dev/usb/input/wsp.c @@ -101,7 +101,7 @@ static struct wsp_tuning { int pressure_untouch_threshold; int pressure_tap_threshold; int scr_threshold; - int max_finger_area; + int max_finger_diameter; int max_scroll_finger_distance; int max_double_tap_distance; int enable_single_tap_clicks; @@ -120,7 +120,7 @@ static struct wsp_tuning { .pressure_untouch_threshold = 10, .pressure_tap_threshold = 120, .scr_threshold = 20, - .max_finger_area = 1900, + .max_finger_diameter = 1900, .max_scroll_finger_distance = MAX_FINGER_ORIENTATION/2, .max_double_tap_distance = 2500, .enable_single_tap_clicks = 1, @@ -140,7 +140,7 @@ wsp_running_rangecheck(struct wsp_tuning *ptun) WSP_CLAMP(ptun->pressure_touch_threshold, 1, 255); WSP_CLAMP(ptun->pressure_untouch_threshold, 1, 255); WSP_CLAMP(ptun->pressure_tap_threshold, 1, 255); - WSP_CLAMP(ptun->max_finger_area, 1, 2400); + WSP_CLAMP(ptun->max_finger_diameter, 1, 2400); WSP_CLAMP(ptun->max_scroll_finger_distance, 1, MAX_FINGER_ORIENTATION); WSP_CLAMP(ptun->max_double_tap_distance, 1, MAX_FINGER_ORIENTATION); WSP_CLAMP(ptun->scr_threshold, 1, 255); @@ -168,8 +168,8 @@ SYSCTL_INT(_hw_usb_wsp, OID_AUTO, pressure_untouch_threshold, CTLFLAG_RWTUN, &wsp_tuning.pressure_untouch_threshold, 0, "untouch pressure threshold"); SYSCTL_INT(_hw_usb_wsp, OID_AUTO, pressure_tap_threshold, CTLFLAG_RWTUN, &wsp_tuning.pressure_tap_threshold, 0, "tap pressure threshold"); -SYSCTL_INT(_hw_usb_wsp, OID_AUTO, max_finger_area, CTLFLAG_RWTUN, - &wsp_tuning.max_finger_area, 0, "maximum finger area"); +SYSCTL_INT(_hw_usb_wsp, OID_AUTO, max_finger_diameter, CTLFLAG_RWTUN, + &wsp_tuning.max_finger_diameter, 0, "maximum finger diameter"); SYSCTL_INT(_hw_usb_wsp, OID_AUTO, max_scroll_finger_distance, CTLFLAG_RWTUN, &wsp_tuning.max_scroll_finger_distance, 0, "maximum scroll finger distance"); SYSCTL_INT(_hw_usb_wsp, OID_AUTO, max_double_tap_distance, CTLFLAG_RWTUN, @@ -897,10 +897,10 @@ wsp_attach(device_t dev) 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); - /* finger touch area */ + /* 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); - /* finger approach area */ + /* finger major/minor approach */ WSP_SUPPORT_ABS(sc->sc_evdev, ABS_MT_WIDTH_MAJOR, sc->sc_params->w); WSP_SUPPORT_ABS(sc->sc_evdev, ABS_MT_WIDTH_MINOR, sc->sc_params->w); /* finger orientation */ @@ -1110,7 +1110,7 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error) switch (ntouch) { case 1: if (sc->index[0]->touch_major > tun.pressure_tap_threshold && - sc->index[0]->tool_major <= tun.max_finger_area) + sc->index[0]->tool_major <= tun.max_finger_diameter) sc->ntaps = 1; break; case 2: @@ -1216,7 +1216,7 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error) dx = dy = 0; /* Ignore unexpected movement when typing (palm detection) */ - if (ntouch == 1 && sc->index[0]->tool_major > tun.max_finger_area) + if (ntouch == 1 && sc->index[0]->tool_major > tun.max_finger_diameter) dx = dy = 0; if (sc->ibtn != 0 && ntouch == 1 &&