From owner-svn-src-projects@FreeBSD.ORG  Sun Jul 31 16:08:29 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 97D39106566B;
	Sun, 31 Jul 2011 16:08:29 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 87B228FC12;
	Sun, 31 Jul 2011 16:08:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6VG8TvI053484;
	Sun, 31 Jul 2011 16:08:29 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6VG8Tvk053482;
	Sun, 31 Jul 2011 16:08:29 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201107311608.p6VG8Tvk053482@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 31 Jul 2011 16:08:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224549 - projects/hid/sys/dev/usb/input
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Jul 2011 16:08:29 -0000

Author: mav
Date: Sun Jul 31 16:08:29 2011
New Revision: 224549
URL: http://svn.freebsd.org/changeset/base/224549

Log:
  Tune USB_GET_REPORT/USB_SET_REPORT IOCTLs to work with multiple report,
  possibly with different sizes.

Modified:
  projects/hid/sys/dev/usb/input/uhid.c

Modified: projects/hid/sys/dev/usb/input/uhid.c
==============================================================================
--- projects/hid/sys/dev/usb/input/uhid.c	Sun Jul 31 15:23:21 2011	(r224548)
+++ projects/hid/sys/dev/usb/input/uhid.c	Sun Jul 31 16:08:29 2011	(r224549)
@@ -566,8 +566,10 @@ uhid_ioctl(struct usb_fifo *fifo, u_long
 		default:
 			return (EINVAL);
 		}
+		if (id != 0)
+			copyin(ugd->ugd_data, &id, 1);
 		error = uhid_get_report(sc, ugd->ugd_report_type, id,
-		    NULL, ugd->ugd_data, size);
+		    NULL, ugd->ugd_data, imin(ugd->ugd_maxlen, size));
 		break;
 
 	case USB_SET_REPORT:
@@ -592,8 +594,10 @@ uhid_ioctl(struct usb_fifo *fifo, u_long
 		default:
 			return (EINVAL);
 		}
+		if (id != 0)
+			copyin(ugd->ugd_data, &id, 1);
 		error = uhid_set_report(sc, ugd->ugd_report_type, id,
-		    NULL, ugd->ugd_data, size);
+		    NULL, ugd->ugd_data, imin(ugd->ugd_maxlen, size));
 		break;
 
 	case USB_GET_REPORT_ID: