From owner-p4-projects@FreeBSD.ORG  Wed Mar 11 22:22:42 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 456181065676; Wed, 11 Mar 2009 22:22:42 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 003661065672
	for <perforce@FreeBSD.org>; Wed, 11 Mar 2009 22:22:41 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E24EA8FC12
	for <perforce@FreeBSD.org>; Wed, 11 Mar 2009 22:22:41 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2BMMfvX054283
	for <perforce@FreeBSD.org>; Wed, 11 Mar 2009 22:22:41 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2BMMfP8054281
	for perforce@freebsd.org; Wed, 11 Mar 2009 22:22:41 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Mar 2009 22:22:41 GMT
Message-Id: <200903112222.n2BMMfP8054281@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 159091 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Mar 2009 22:22:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=159091

Change 159091 by hselasky@hselasky_laptop001 on 2009/03/11 22:21:41

	
	USB CORE: Be less strict on the last HID item usage.
	
	Reported by: Andrey Chernov

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#23 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#23 (text+ko) ====

@@ -68,6 +68,7 @@
 	struct hid_item cur[MAXPUSH];
 	int32_t	usages_min[MAXUSAGE];
 	int32_t	usages_max[MAXUSAGE];
+	int32_t usage_last;	/* last seen usage */
 	uint32_t loc_size;	/* last seen size */
 	uint32_t loc_count;	/* last seen count */
 	uint8_t	kindset;	/* we have 5 kinds so 8 bits are enough */
@@ -183,15 +184,21 @@
 
  top:
 	/* check if there is an array of items */
-	if ((s->icount != s->ncount) &&
-	    (s->iusage != s->nusage)) {
-		dval = s->usages_min[s->iusage] + s->ousage;
-		c->usage = dval;
-		if (dval == s->usages_max[s->iusage]) {
-			s->iusage ++;
-			s->ousage = 0;
+	if (s->icount < s->ncount) {
+		/* get current usage */
+		if (s->iusage < s->nusage) {
+			dval = s->usages_min[s->iusage] + s->ousage;
+			c->usage = dval;
+			s->usage_last = dval;
+			if (dval == s->usages_max[s->iusage]) {
+				s->iusage ++;
+				s->ousage = 0;
+			} else {
+				s->ousage ++;
+			}
 		} else {
-			s->ousage ++;
+			DPRINTFN(1, "Using last usage\n");
+			dval = s->usage_last;
 		}
 		s->icount ++;
 		/* 
@@ -290,14 +297,9 @@
 				} else {
 					s->ncount = 1;
 				}
-				/* make sure we have a usage */
-				if (s->nusage == 0) {
-					DPRINTFN(1, "Using default usage\n");
-					/* use the undefined HID PAGE */
-					s->usages_min[s->nusage] = 0x0000;
-					s->usages_max[s->nusage] = 0xFFFF;
-					s->nusage = s->ncount;
-				}
+				/* set default usage */
+				/* use the undefined HID PAGE */
+				s->usage_last = 0;
 				goto top;
 
 			case 9:	/* Output */