From owner-p4-projects@FreeBSD.ORG  Wed Jun  4 16:20:16 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C609D1065677; Wed,  4 Jun 2008 16:20:16 +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 889271065675
	for <perforce@FreeBSD.org>; Wed,  4 Jun 2008 16:20:16 +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 6FAEA8FC2B
	for <perforce@FreeBSD.org>; Wed,  4 Jun 2008 16:20:16 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m54GKGTP098116
	for <perforce@FreeBSD.org>; Wed, 4 Jun 2008 16:20:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m54GKGJm098114
	for perforce@freebsd.org; Wed, 4 Jun 2008 16:20:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 4 Jun 2008 16:20:16 GMT
Message-Id: <200806041620.m54GKGJm098114@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 142894 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, 04 Jun 2008 16:20:17 -0000

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

Change 142894 by hselasky@hselasky_laptop001 on 2008/06/04 16:19:51

	
	USB Device Side Mode: Make sure that non-interface specific control
	endpint messages gets broadcasted.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#125 edit

Differences ...

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

@@ -3380,6 +3380,7 @@
 	uint16_t wValue;
 	uint16_t wIndex;
 	uint8_t state;
+	uint8_t iface_index;
 	union {
 		uWord	wStatus;
 		uint8_t	buf[2];
@@ -3528,13 +3529,15 @@
 		}
 		break;
 	default:
+		if (state == ST_DATA) {
+			goto tr_bad_context;
+		}
 		if ((req.bmRequestType & 0x1F) == UT_INTERFACE) {
-			if (state == ST_DATA) {
-				goto tr_bad_context;
-			}
-			goto tr_handle_iface_request;
+			iface_index = req.wIndex[0];	/* unicast */
+		} else {
+			iface_index = 0;/* broadcast */
 		}
-		goto tr_stalled;
+		goto tr_handle_iface_request;
 	}
 	goto tr_valid;
 
@@ -3641,7 +3644,7 @@
 	goto tr_valid;
 
 tr_handle_iface_request:
-	iface = usbd_get_iface(udev, req.wIndex[0]);
+	iface = usbd_get_iface(udev, iface_index);
 	if (iface == NULL) {
 		goto tr_stalled;
 	}
@@ -3672,6 +3675,10 @@
 	goto tr_handle_iface_request_builtin;
 
 tr_handle_iface_request_builtin:
+	if ((req.bmRequestType & 0x1F) != UT_INTERFACE) {
+		iface_index++;		/* iterate */
+		goto tr_handle_iface_request;
+	}
 	switch (req.bmRequestType) {
 	case UT_WRITE_INTERFACE:
 		switch (req.bRequest) {
@@ -3722,6 +3729,8 @@
 			goto tr_stalled;
 		}
 		break;
+	default:
+		goto tr_stalled;
 	}
 	goto tr_valid;