From nobody Fri Mar 7 17:55:24 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 4Z8Yq114Qnz5pv70; Fri, 07 Mar 2025 17:55:25 +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 4Z8Yq04Pzjz3YBx; Fri, 07 Mar 2025 17:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741370124; 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=oNQfKoiMFF4AMdZgyhitgca5wT0Ce+2BCGGGTPRNnTY=; b=B0/LFBNrE5241I64Z6DxgI4LQ+qhPqULNWmusWQIE/2YM1T69Y6tCjyY8R6cIaUtoXeYIb gHQ8ds2aGFtFZvn1VSsWI2BbUbhokHQSkNJWuXKADJa7kPm4h4srId+BSkB0qoWMz/SMtZ y8tiwoqV4SQl5PNe4KG17yo/rxZY20eYk1P+1MoFWjXpySgrEoNf8rMxiUbgDVljBV7FxA Z1St91taPziRhbDyIYGRFUfi9Zj59x+MP0FVUduBAwxtAYC+gPScHnUd8PIDcoWRigT/xk kFfyjbA+Dx5tqItv2Kj0EF/Vn+KuXQAP6vhT1Y5ugtyhmNaPz9J+Y6xSZ9f6ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741370124; a=rsa-sha256; cv=none; b=qnX+r4f8vqmgxNMrbGnthtYVHlhcvS1/85a7OFfoXPuRI4+SGvFYiswROdXSlG+5zAeDe+ QExyk736HMUgsC2I5DRueNdSyfzMT0kx656/pAOuEpHBkgA++wNM+x0mrMPAVhQLM81B77 A0G8eJ5y9I/tEJO1baMbJxhnRDQOdtB9Fjd3mGnG/vsovY9MQJkhSNRlAgcY4A2mrcnREb qm3egt94PKtT6u00PJ/gADja3gfO1QtqlO3oJteHCdT1TkeeAUxpBanmN6k5pLkC01tdL2 Eb+teLfj0hX262oAvPcb+dKhqDmvRNbBDqF7R1tDmaPXXMPcwO6RVeUSty6RGA== 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=1741370124; 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=oNQfKoiMFF4AMdZgyhitgca5wT0Ce+2BCGGGTPRNnTY=; b=awJshlaixwfvFqngiSIofCSGqN2kLniXR8AePNmhFIZGMNz5WgOWBsP29ALvtLfdEYc98y 9L8Zhk1WTDgJxJqAk7XG0LXHQjNu3llqxTu9txKU8TsL1JjKyCa1scLlr/INIUfhzl1DzX phvY5b1fntWQLfVq97B3UYq5BiEsEgqNgq23HYxPrMznU1T5DenQWiWiC0RaRb11Jb3p4z PiaP+HMBahy+1VWujY/rSiogMSouTa5v3sX7YTxEBJIN2YvMNIoatXjoQ2T/MgnrX/mdbc tB+8DZZlcXLtOgS85JYyPDk2VvO9b+kFMjl/kwpO6Vc6DQeobrlvSr5d7Iqzsg== 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 4Z8Yq03wfvzngM; Fri, 07 Mar 2025 17:55:24 +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 527HtOR8083653; Fri, 7 Mar 2025 17:55:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 527HtOB2083650; Fri, 7 Mar 2025 17:55:24 GMT (envelope-from git) Date: Fri, 7 Mar 2025 17:55:24 GMT Message-Id: <202503071755.527HtOB2083650@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: b7269d89e5c3 - main - wsp: Fix whitespaces 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: b7269d89e5c3f63c1ab290938bde92481291f28c Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=b7269d89e5c3f63c1ab290938bde92481291f28c commit b7269d89e5c3f63c1ab290938bde92481291f28c Author: Joshua Rogers AuthorDate: 2025-03-07 17:53:35 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-03-07 17:53:35 +0000 wsp: Fix whitespaces Signed-off-by: Joshua Rogers --- sys/dev/usb/input/wsp.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/sys/dev/usb/input/wsp.c b/sys/dev/usb/input/wsp.c index b9311ffd6c2d..f78d64f69c08 100644 --- a/sys/dev/usb/input/wsp.c +++ b/sys/dev/usb/input/wsp.c @@ -73,7 +73,7 @@ } while (0) /* Tunables */ -static SYSCTL_NODE(_hw_usb, OID_AUTO, wsp, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, +static SYSCTL_NODE(_hw_usb, OID_AUTO, wsp, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "USB wsp"); #ifdef USB_DEBUG @@ -121,7 +121,7 @@ static struct wsp_tuning { .pressure_tap_threshold = 120, .scr_threshold = 20, .max_finger_diameter = 1900, - .max_scroll_finger_distance = MAX_FINGER_ORIENTATION/2, + .max_scroll_finger_distance = 8192, .max_double_tap_distance = 2500, .enable_single_tap_clicks = 1, .enable_single_tap_movement = 1, @@ -141,8 +141,8 @@ wsp_running_rangecheck(struct wsp_tuning *ptun) WSP_CLAMP(ptun->pressure_untouch_threshold, 1, 255); WSP_CLAMP(ptun->pressure_tap_threshold, 1, 255); 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->max_scroll_finger_distance, 1, 16384); + WSP_CLAMP(ptun->max_double_tap_distance, 1, 16384); WSP_CLAMP(ptun->scr_threshold, 1, 255); WSP_CLAMP(ptun->enable_single_tap_clicks, 0, 1); WSP_CLAMP(ptun->enable_single_tap_movement, 0, 1); @@ -329,7 +329,7 @@ struct tp_finger { int16_t unused[2]; /* zeros */ int16_t pressure; /* pressure on forcetouch touchpad */ int16_t multi; /* one finger: varies, more fingers: - * constant */ + * constant */ } __packed; /* trackpad finger data size, empirically at least ten fingers */ @@ -1033,7 +1033,7 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error) f->pressure = le16toh((uint16_t)f->pressure); f->multi = le16toh((uint16_t)f->multi); } - DPRINTFN(WSP_LLEVEL_INFO, + DPRINTFN(WSP_LLEVEL_INFO, "[%d]ibt=%d, taps=%d, o=%4d, ax=%5d, ay=%5d, " "rx=%5d, ry=%5d, tlmaj=%4d, tlmin=%4d, ot=%4x, " "tchmaj=%4d, tchmin=%4d, presure=%4d, m=%4x\n", @@ -1176,6 +1176,7 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error) else if (sc->dt_sum < 0) wsp_add_to_queue(sc, 0, 0, 0, 1UL << 4); } + sc->dz_count = WSP_DZ_MAX_COUNT; sc->dz_sum = 0; sc->intr_count = 0; @@ -1219,15 +1220,15 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t error) if (ntouch == 1 && sc->index[0]->tool_major > tun.max_finger_diameter) dx = dy = 0; - if (sc->ibtn != 0 && ntouch == 1 && - sc->intr_count < WSP_TAP_MAX_COUNT && + if (sc->ibtn != 0 && ntouch == 1 && + sc->intr_count < WSP_TAP_MAX_COUNT && abs(sc->dx_sum) < 1 && abs(sc->dy_sum) < 1 ) dx = dy = 0; if (ntouch == 2 && sc->sc_status.button != 0) { dx = sc->pos_x[sc->finger] - sc->pre_pos_x[sc->finger]; dy = sc->pos_y[sc->finger] - sc->pre_pos_y[sc->finger]; - + /* * Ignore movement of switch finger or * movement from ibt=0 to ibt=1 @@ -1407,6 +1408,7 @@ wsp_add_to_queue(struct wsp_softc *sc, int dx, int dy, int dz, buf[6] = dz - (dz >> 1);/* dz - (dz / 2) */ buf[7] = (((~buttons_in) >> 3) & MOUSE_SYS_EXTBUTTONS); } + usb_fifo_put_data_linear(sc->sc_fifo.fp[USB_FIFO_RX], buf, sc->sc_mode.packetsize, 1); }