From owner-p4-projects@FreeBSD.ORG  Thu Dec 20 18:24:48 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B18D016A469; Thu, 20 Dec 2007 18:24:48 +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 5D37216A418
	for <perforce@FreeBSD.org>; Thu, 20 Dec 2007 18:24:48 +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 434F613C468
	for <perforce@FreeBSD.org>; Thu, 20 Dec 2007 18:24:48 +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 lBKIOm1M030371
	for <perforce@FreeBSD.org>; Thu, 20 Dec 2007 18:24:48 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBKIOm63030368
	for perforce@freebsd.org; Thu, 20 Dec 2007 18:24:48 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 20 Dec 2007 18:24:48 GMT
Message-Id: <200712201824.lBKIOm63030368@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 131312 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: Thu, 20 Dec 2007 18:24:49 -0000

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

Change 131312 by hselasky@hselasky_laptop001 on 2007/12/20 18:24:11

	
	This commit is device side related.
	
	Add automagic handling of USB CDC descriptors with regard to
	the interface numbers.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_template.c#5 edit

Differences ...

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

@@ -44,22 +44,40 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usb_subr.h>
 #include <dev/usb/usb_template.h>
+#include <dev/usb/usb_cdc.h>
 
 static void
 usbd_make_raw_desc(struct usbd_temp_setup *temp,
     const uint8_t *raw)
 {
 	void *dst;
+	uint8_t len;
 
 	/*
          * The first byte of any USB descriptor gives the length.
          */
 	if (raw) {
+		len = raw[0];
 		if (temp->buf) {
 			dst = USBD_ADD_BYTES(temp->buf, temp->size);
-			bcopy(raw, dst, raw[0]);
+			bcopy(raw, dst, len);
+
+			/* check if we have got a CDC union descriptor */
+
+			if ((raw[0] >= sizeof(usb_cdc_union_descriptor_t)) &&
+			    (raw[1] == UDESC_CS_INTERFACE) &&
+			    (raw[2] == UDESCSUB_CDC_UNION)) {
+				usb_cdc_union_descriptor_t *ud = (void *)dst;
+
+				/* update the interface numbers */
+
+				ud->bMasterInterface +=
+				    temp->bInterfaceNumber;
+				ud->bSlaveInterface[0] +=
+				    temp->bInterfaceNumber;
+			}
 		}
-		temp->size += raw[0];
+		temp->size += len;
 	}
 	return;
 }