From nobody Tue Feb 10 22:59:51 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 4f9cTN0tSFz6SDVM for ; Tue, 10 Feb 2026 22:59:52 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9cTN0M9tz3brh for ; Tue, 10 Feb 2026 22:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770764392; 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=A3kEFpZQYSWck8YoG0NyyetNv4iyax/ZZFcH3JzD8iI=; b=okmbfFE1FmCLw0/BBUm7kQXfs0P0VrTWb7QCTHGNbcjtlv45APBQeDdiCL0fn71L0dUxyL uZo93aeJQi0Zf70HZafTD9AqHK+SGM9UPFtZDkHh39gtwx1zt7aoHODevrUUh6p2wH/cjb HEQg/c3dQwLQp5MLIinFFHsspEBCCmxlf4TqvWDfk0qnEq/WqGx73/xNpjpCcKF8WyJ1es P65OfX/yw3eAk3K1yi7jsId1/xJsYWaoJu9TshDMYyHis4O3X/R9ZLFLKXt3a5eFOSNjTK ILAU5IY6vQdOL2/kFXlwn6yGli5men9hQ0hvRTRiZXvr8nxy3/fKwxnSuyacmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770764392; a=rsa-sha256; cv=none; b=F6k77RagMbBU/n1O4HQvnnZ6A/ugBARqxoP9LjnALTaY26FPZtPogmTP8/Lqwkg9OWNPmp A06wY2IHPqokfbceuGEAAV5jWfchVA0dUf4K4X/vEvikkjjNbppT/BWR2Cgk0uPwSTYlnT +dA+va3iHT+y+Iolr+c0r8DQnrXuvuwalkPYIOK4fDYjR0n/L5IGKsudH5Rm6WK3OArM4b /j0ELdGnjCwylSJZWa6if4N57atOr84+B56SBj+/5Wz8mkG7wiDQuoibdBcfy/WY0Lk5u1 dWKyHjbrYHatiEljk5AALm662aQgJ+qTKH4UjDHgO+7vXNxR+aR1zGEx+C2hDQ== 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=1770764392; 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=A3kEFpZQYSWck8YoG0NyyetNv4iyax/ZZFcH3JzD8iI=; b=UfXZ5sXJEoiVeBEUTfHz8P3muDTpRlgs1Gd8eXeoHYpvqUoticbYN2fgKop3dTdLHxP0ih iCKieNJI53E79GYiMahEEh4WSv1cmt/3XFSjBKDWM+XGwrfKJbuvtxZE2QAt1X/NzQg47X ufDw1SAUXEfOCuMY23aFYU5/YIB2Ob5Kwe8hn3DV8I72T9hvN7+ZvgGYiHTXPjhLQeBi/h RhWkgsTbnPZTsD0YwvnW9pjGjKpXn7g/1yda67WoBag3QRA4D/IVI+oivO5J5tPOFdWzi6 1x7v9L/P2uyyMmjGU/gdNmsVAqayJ3nTD34Qz081SzRWm0THhNrx0Yrm+FOYhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9cTM6D6mz81k for ; Tue, 10 Feb 2026 22:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 268bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 22:59:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 3d85dcd1a9aa - main - psm(4): Add middle button support for Elantech V4 touchpads 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/main X-Git-Reftype: branch X-Git-Commit: 3d85dcd1a9aa2e1b903935062500cb15b1a700f8 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 22:59:51 +0000 Message-Id: <698bb867.268bf.772cc624@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=3d85dcd1a9aa2e1b903935062500cb15b1a700f8 commit 3d85dcd1a9aa2e1b903935062500cb15b1a700f8 Author: Vladimir Kondratyev AuthorDate: 2026-02-10 22:59:06 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-02-10 22:59:06 +0000 psm(4): Add middle button support for Elantech V4 touchpads based on firmware version. PR: 291262 MFC after: 1 month --- sys/dev/atkbdc/psm.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index d36396df0fa0..95acf43a3bc6 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -352,6 +352,8 @@ typedef struct elantechhw { int dptracey; int issemimt; int isclickpad; + int hassmbusnotify; + int has3buttons; int hascrc; int hastrackpoint; int haspressure; @@ -417,7 +419,7 @@ enum { ((pb)->ipacket[0] & 0x0c) == 0x0c && ((pb)->ipacket[3] & 0xce) == 0x0c) #define ELANTECH_PKT_IS_V4(pb, hascrc) ((hascrc) ? \ ((pb)->ipacket[3] & 0x08) == 0x00 : \ - ((pb)->ipacket[0] & 0x0c) == 0x04 && ((pb)->ipacket[3] & 0x1c) == 0x10) + ((pb)->ipacket[0] & 0x08) == 0x00 && ((pb)->ipacket[3] & 0x1c) == 0x10) typedef struct elantechaction { finger_t fingers[ELANTECH_MAX_FINGERS]; @@ -1930,8 +1932,11 @@ psm_register_elantech(device_t dev) evdev_support_key(evdev_a, BTN_TOUCH); evdev_support_nfingers(evdev_a, ELANTECH_MAX_FINGERS); evdev_support_key(evdev_a, BTN_LEFT); - if (!sc->elanhw.isclickpad) + if (!sc->elanhw.isclickpad) { evdev_support_key(evdev_a, BTN_RIGHT); + if (sc->elanhw.has3buttons) + evdev_support_key(evdev_a, BTN_MIDDLE); + } psm_support_abs_bulk(evdev_a, elantech_absinfo); error = evdev_register_mtx(evdev_a, &Giant); @@ -4755,6 +4760,9 @@ proc_elantech(struct psm_softc *sc, packetbuf_t *pb, mousestatus_t *ms, touchpad_button = ((pb->ipacket[0] & 0x01) ? MOUSE_BUTTON1DOWN : 0) | ((pb->ipacket[0] & 0x02) ? MOUSE_BUTTON3DOWN : 0); + if (sc->elanhw.has3buttons) + touchpad_button |= + ((pb->ipacket[0] & 0x04) ? MOUSE_BUTTON2DOWN : 0); } #ifdef EVDEV_SUPPORT @@ -7347,6 +7355,9 @@ enable_elantech(struct psm_softc *sc, enum probearg arg) elanhw.hwversion = hwversion; elanhw.issemimt = hwversion == 2; elanhw.isclickpad = (resp[1] & 0x10) != 0; + elanhw.hassmbusnotify = + icversion == 0x0f && (resp[1] & 0x20) != 0 && resp[2] != 0; + elanhw.has3buttons = elanhw.hassmbusnotify; elanhw.hascrc = (resp[1] & 0x40) != 0; elanhw.haspressure = elanhw.fwversion >= 0x020800;