From owner-freebsd-bugbusters@FreeBSD.ORG Tue Apr 26 21:41:23 2005 Return-Path: Delivered-To: freebsd-bugbusters@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E9A9916A4CE for ; Tue, 26 Apr 2005 21:41:22 +0000 (GMT) Received: from ms-smtp-04.texas.rr.com (ms-smtp-04.texas.rr.com [24.93.47.43]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15C6943D5A for ; Tue, 26 Apr 2005 21:41:22 +0000 (GMT) (envelope-from lmendez19@austin.rr.com) Received: from [192.168.0.6] (cpe-67-9-163-3.austin.res.rr.com [67.9.163.3]) j3QLfJgJ005502 for ; Tue, 26 Apr 2005 16:41:19 -0500 (CDT) From: Lonnie Mendez To: bugbusters@FreeBSD.org Date: Tue, 26 Apr 2005 16:43:01 -0500 User-Agent: KMail/1.8 MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_lXrbC2i7WPyecuV" Message-Id: <200504261643.01958.lmendez19@austin.rr.com> X-Virus-Scanned: Symantec AntiVirus Scan Engine Subject: [PATCH] send-pr report attached X-BeenThere: freebsd-bugbusters@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Coordination of the Problem Report handling effort. List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 21:41:23 -0000 --Boundary-00=_lXrbC2i7WPyecuV Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline I hope this is an acceptable format... thank you. --Boundary-00=_lXrbC2i7WPyecuV Content-Type: text/x-diff; charset="us-ascii"; name="hidquirk" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="hidquirk" To: FreeBSD-gnats-submit@freebsd.org From: Lonnie Mendez Reply-To: lmendez19@austin.rr.com Cc: X-send-pr-version: 3.113 X-GNATS-Notify: >Submitter-Id: current-users >Originator: Lonnie Mendez >Organization: >Confidential: no >Synopsis: [PATCH] Add quirk for uhid to ignore certain usb devices (blacklist) >Severity: non-critical >Priority: low >Category: kern >Class: change-request >Release: FreeBSD 5.3-RELEASE-p10 i386 >Environment: System: FreeBSD twind.austin.rr.com 5.3-RELEASE-p10 FreeBSD 5.3-RELEASE-p10 #3: Tue Apr 26 07:46:25 CDT 2005 root@twind.austin.rr.com:/usr/src/sys/i386/compile/MINIME i386 >Description: This patch allows uhid to leave alone devices that identify themselves as hid based, but are indeed used via another interface. This is very simliar in concept to the hid blacklist table found in hid-core.c in the linux kernel. >How-To-Repeat: Applies to 5.3/FreeBSD-CURRENT kernel. Runtime tested. >Fix: --- hid_blacklist.patch begins here --- diff -u -r ./uhid.c hidpatch/uhid.c --- ./uhid.c Tue Oct 12 19:51:01 2004 +++ hidpatch/uhid.c Tue Apr 26 07:40:07 2005 @@ -91,6 +91,9 @@ /* Report descriptor for broken Wacom Graphire */ #include +/* For hid blacklist quirk */ +#include + #ifdef USB_DEBUG #define DPRINTF(x) if (uhiddebug) logprintf x #define DPRINTFN(n,x) if (uhiddebug>(n)) logprintf x @@ -190,6 +193,8 @@ return (UMATCH_NONE); id = usbd_get_interface_descriptor(uaa->iface); if (id == NULL || id->bInterfaceClass != UICLASS_HID) + return (UMATCH_NONE); + if (usbd_get_quirks(uaa->device)->uq_flags & UQ_HID_IGNORE) return (UMATCH_NONE); #if 0 if (uaa->matchlvl) diff -u -r ./usb_quirks.c hidpatch/usb_quirks.c --- ./usb_quirks.c Mon Sep 20 00:18:04 2004 +++ hidpatch/usb_quirks.c Tue Apr 26 03:24:12 2005 @@ -101,6 +101,9 @@ ANY, { UQ_ASSUME_CM_OVER_DATA }}, { USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_AS64LX, 0x100, { UQ_ASSUME_CM_OVER_DATA }}, + /* Devices which should be ignored by uhid */ + { USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE, + ANY, { UQ_HID_IGNORE }}, { 0, 0, 0, { 0 } } }; diff -u -r ./usb_quirks.h hidpatch/usb_quirks.h --- ./usb_quirks.h Thu Jul 5 05:12:59 2001 +++ hidpatch/usb_quirks.h Tue Apr 26 07:41:18 2005 @@ -54,6 +54,7 @@ #define UQ_AU_INP_ASYNC 0x0800 /* input is async despite claim of adaptive */ #define UQ_ASSUME_CM_OVER_DATA 0x1000 /* modem device breaks on cm over data */ #define UQ_BROKEN_BIDIR 0x2000 /* printer has broken bidir mode */ +#define UQ_HID_IGNORE 0x4000 /* device should be ignored by hid class */ }; extern const struct usbd_quirks usbd_no_quirk; --- hid_blacklist.patch ends here --- --Boundary-00=_lXrbC2i7WPyecuV--