From owner-freebsd-x11@FreeBSD.ORG  Mon Feb  3 14:49:04 2014
Return-Path: <owner-freebsd-x11@FreeBSD.ORG>
Delivered-To: freebsd-x11@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 55A7DE27;
 Mon,  3 Feb 2014 14:49:04 +0000 (UTC)
Received: from master.debian.org (master.debian.org
 [IPv6:2001:41b8:202:deb:216:36ff:fe40:4001])
 (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1B1FF1026;
 Mon,  3 Feb 2014 14:49:04 +0000 (UTC)
Received: from localhost ([::1]) by master.debian.org with esmtp (Exim 4.80)
 (envelope-from <rmh@freebsd.org>)
 id 1WAKpa-0002g1-Fs; Mon, 03 Feb 2014 14:49:02 +0000
Message-ID: <52EFAC5D.8010603@freebsd.org>
Date: Mon, 03 Feb 2014 14:49:01 +0000
From: Robert Millan <rmh@freebsd.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:24.0) Gecko/20100101 Thunderbird/24.2.0
MIME-Version: 1.0
To: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: [PATCH] ignore uhid devices in X devd backend
X-Enigmail-Version: 1.6
Content-Type: multipart/mixed; boundary="------------070709070307000400040106"
Cc: freebsd-x11@freebsd.org
X-BeenThere: freebsd-x11@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: X11 on FreeBSD -- maintaining and support <freebsd-x11.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-x11>,
 <mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11/>
List-Post: <mailto:freebsd-x11@freebsd.org>
List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
 <mailto:freebsd-x11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Feb 2014 14:49:04 -0000

This is a multi-part message in MIME format.
--------------070709070307000400040106
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit


This patch removes uhid from the hw_types[] list. According to the
uhid driver description, this driver is only a fallback for devices
not supported by any other driver.

On my system, the USB keyboard shows up as an uhid device in addition
to /dev/ukbd0, but the previous devd code misidentified it as a mouse.

This just leads to trouble when X attempts to open() it and fails,
for the reasons described in my earlier devd_no_kbd.diff patch.

-- 
Robert Millan

--------------070709070307000400040106
Content-Type: text/x-patch;
 name="devd_remove_uhid.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="devd_remove_uhid.diff"

=== modified file 'devd.c'
--- devd.c	2014-02-03 14:43:14 +0000
+++ devd.c	2014-02-03 14:44:07 +0000
@@ -73,7 +73,6 @@ static struct hw_type hw_types[] = {
 	{ "atkbd", ATTR_KEYBOARD, "kdb" },
 	{ "ums", ATTR_POINTER, "mouse" },
 	{ "psm", ATTR_POINTER, "mouse" },
-	{ "uhid", ATTR_POINTER, "mouse" },
 	{ "joy", ATTR_JOYSTICK, NULL },
 	{ "atp", ATTR_TOUCHPAD, NULL },
 	{ "uep", ATTR_TOUCHSCREEN, NULL },


--------------070709070307000400040106--