From owner-dev-commits-src-branches@freebsd.org Mon Aug 23 22:26:15 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2BA03672C48;
Mon, 23 Aug 2021 22:26:15 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Gtmzq0LjZz3NSQ;
Mon, 23 Aug 2021 22:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 E28F31C690;
Mon, 23 Aug 2021 22:26:14 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17NMQE5i014733;
Mon, 23 Aug 2021 22:26:14 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17NMQEIt014732;
Mon, 23 Aug 2021 22:26:14 GMT (envelope-from git)
Date: Mon, 23 Aug 2021 22:26:14 GMT
Message-Id: <202108232226.17NMQEIt014732@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Vladimir Kondratyev <wulf@FreeBSD.org>
Subject: git: a711310d2db5 - stable/13 - hid: Add extra constant to units of
measurement
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/13
X-Git-Reftype: branch
X-Git-Commit: a711310d2db5549dce218960e5f405d8fe13d66c
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
<dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Aug 2021 22:26:15 -0000
The branch stable/13 has been updated by wulf:
URL: https://cgit.FreeBSD.org/src/commit/?id=a711310d2db5549dce218960e5f405d8fe13d66c
commit a711310d2db5549dce218960e5f405d8fe13d66c
Author: Vladimir Kondratyev <wulf@FreeBSD.org>
AuthorDate: 2021-08-16 20:13:24 +0000
Commit: Vladimir Kondratyev <wulf@FreeBSD.org>
CommitDate: 2021-08-23 22:20:30 +0000
hid: Add extra constant to units of measurement
Some devices like eGalax touchscreens use value of 0x33 instead of 0x13
for inches as unit of measure.
Reported by: Mark Kane <mark_AT_kane_DOT_mn>
(cherry picked from commit be75951af1ec2d69d34a8701700b9bfd2a50679e)
---
sys/dev/hid/hid.c | 1 +
sys/dev/hid/hid.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/sys/dev/hid/hid.c b/sys/dev/hid/hid.c
index 699bfa4a8bb3..f201182ac20f 100644
--- a/sys/dev/hid/hid.c
+++ b/sys/dev/hid/hid.c
@@ -856,6 +856,7 @@ hid_item_resolution(struct hid_item *hi)
divisor = 10;
break;
case HUM_INCH:
+ case HUM_INCH_EGALAX:
multiplier = 10;
divisor = 254;
break;
diff --git a/sys/dev/hid/hid.h b/sys/dev/hid/hid.h
index 37ab8c9cdf7e..f0311bae689c 100644
--- a/sys/dev/hid/hid.h
+++ b/sys/dev/hid/hid.h
@@ -185,6 +185,7 @@
#define HUM_CENTIMETER 0x11
#define HUM_RADIAN 0x12
#define HUM_INCH 0x13
+#define HUM_INCH_EGALAX 0x33
#define HUM_DEGREE 0x14
#if defined(_KERNEL) || defined(_STANDALONE)