From owner-svn-src-stable@freebsd.org Mon Dec 4 20:09:39 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 62BC9E696B2;
Mon, 4 Dec 2017 20:09:39 +0000 (UTC)
(envelope-from wulf@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 2E4E876FF6;
Mon, 4 Dec 2017 20:09:39 +0000 (UTC)
(envelope-from wulf@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB4K9ceS075465;
Mon, 4 Dec 2017 20:09:38 GMT (envelope-from wulf@FreeBSD.org)
Received: (from wulf@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB4K9cXX075464;
Mon, 4 Dec 2017 20:09:38 GMT (envelope-from wulf@FreeBSD.org)
Message-Id: <201712042009.vB4K9cXX075464@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wulf set sender to
wulf@FreeBSD.org using -f
From: Vladimir Kondratyev <wulf@FreeBSD.org>
Date: Mon, 4 Dec 2017 20:09:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326540 - stable/11/sys/dev/evdev
X-SVN-Group: stable-11
X-SVN-Commit-Author: wulf
X-SVN-Commit-Paths: stable/11/sys/dev/evdev
X-SVN-Commit-Revision: 326540
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
<svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Dec 2017 20:09:39 -0000
Author: wulf
Date: Mon Dec 4 20:09:38 2017
New Revision: 326540
URL: https://svnweb.freebsd.org/changeset/base/326540
Log:
MFC r325294:
evdev: Hide "kern.evdev.rcpt_mask" sysctl if kernel is compiled
w/o EVDEV_SUPPORT as it's value has no meaning in this case.
MFC r326019:
evdev: Export EVDEV_SUPPORT kernel option through feature facility
Approved by: gonzo (mentor)
Modified:
stable/11/sys/dev/evdev/evdev.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/evdev/evdev.c
==============================================================================
--- stable/11/sys/dev/evdev/evdev.c Mon Dec 4 17:10:52 2017 (r326539)
+++ stable/11/sys/dev/evdev/evdev.c Mon Dec 4 20:09:38 2017 (r326540)
@@ -50,7 +50,10 @@
#ifdef FEATURE
FEATURE(evdev, "Input event devices support");
+#ifdef EVDEV_SUPPORT
+FEATURE(evdev_support, "Evdev support in hybrid drivers");
#endif
+#endif
enum evdev_sparse_result
{
@@ -64,12 +67,14 @@ MALLOC_DEFINE(M_EVDEV, "evdev", "evdev memory");
int evdev_rcpt_mask = EVDEV_RCPT_SYSMOUSE | EVDEV_RCPT_KBDMUX;
int evdev_sysmouse_t_axis = 0;
+#ifdef EVDEV_SUPPORT
SYSCTL_NODE(_kern, OID_AUTO, evdev, CTLFLAG_RW, 0, "Evdev args");
SYSCTL_INT(_kern_evdev, OID_AUTO, rcpt_mask, CTLFLAG_RW, &evdev_rcpt_mask, 0,
"Who is receiving events: bit0 - sysmouse, bit1 - kbdmux, "
"bit2 - mouse hardware, bit3 - keyboard hardware");
SYSCTL_INT(_kern_evdev, OID_AUTO, sysmouse_t_axis, CTLFLAG_RW,
&evdev_sysmouse_t_axis, 0, "Extract T-axis from 0-none, 1-ums, 2-psm");
+#endif
static void evdev_start_repeat(struct evdev_dev *, uint16_t);
static void evdev_stop_repeat(struct evdev_dev *);