From owner-cvs-src-old@FreeBSD.ORG Tue May 18 10:37:41 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 269CD1065673 for ; Tue, 18 May 2010 10:37:41 +0000 (UTC) (envelope-from kaiw@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 144458FC12 for ; Tue, 18 May 2010 10:37:41 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4IAbdvR011990 for ; Tue, 18 May 2010 10:37:39 GMT (envelope-from kaiw@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4IAbdeF011989 for cvs-src-old@freebsd.org; Tue, 18 May 2010 10:37:39 GMT (envelope-from kaiw@repoman.freebsd.org) Message-Id: <201005181037.o4IAbdeF011989@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to kaiw@repoman.freebsd.org using -f From: Kai Wang Date: Tue, 18 May 2010 10:32:20 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_8 Subject: cvs commit: src/lib/libusbhid data.c descr.c parse.c usage.c usbhid.h usbvar.h src/usr.sbin/bluetooth/bthidd hid.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2010 10:37:41 -0000 kaiw 2010-05-18 10:32:20 UTC FreeBSD src repository Modified files: (Branch: RELENG_8) lib/libusbhid data.c descr.c parse.c usage.c usbhid.h usbvar.h usr.sbin/bluetooth/bthidd hid.c Log: SVN rev 208262 on 2010-05-18 10:32:20Z by kaiw MFC r205728 Merge improvements from kernel HID parser to the userland usbhid(3) parser. This merge does not change any API and should not break any native or thirdparty applications. Changes include: * Merge multiple report ID support and other improvements from kernel HID parser. * Ignore rid argument in hid_start_parser, parse all the report items since we now support multiple report ID. * Skip report ID byte in hid_get_data() and set report ID byte in hid_set_data(), if report ID is non-zero. * Reimplement hid_get_report_id: instead get report id from uhid device (which is always 0), try parsing the report descriptor and return the first report ID encountered. MFC r207812 hid_get_data() now expects that the hid data passed in always contains the report ID byte. Thus we should not skip the the report ID byte in hid_interrupt(). Also, if HUP_KEYBOARD usage is an array, do not try to modify the 'data' pointer, instead, increase the hid_item_t field 'pos' by 'report_size' before calling hid_get_data() during each iteration. Revision Changes Path 1.6.34.4 +23 -8 src/lib/libusbhid/data.c 1.12.2.2 +21 -1 src/lib/libusbhid/descr.c 1.10.30.2 +330 -208 src/lib/libusbhid/parse.c 1.8.34.2 +1 -0 src/lib/libusbhid/usage.c 1.12.2.3 +30 -33 src/lib/libusbhid/usbhid.h 1.4.2.2 +2 -2 src/lib/libusbhid/usbvar.h 1.6.10.2 +5 -11 src/usr.sbin/bluetooth/bthidd/hid.c