From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 11:51:27 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 75A3516A468; Sat,  8 Dec 2007 11:51:27 +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 DC09516A418
	for <perforce@FreeBSD.org>; Sat,  8 Dec 2007 11:51:26 +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 CB60113C44B
	for <perforce@FreeBSD.org>; Sat,  8 Dec 2007 11:51:26 +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 lB8BpQ9I039537
	for <perforce@FreeBSD.org>; Sat, 8 Dec 2007 11:51:26 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB8BpQvD039534
	for perforce@freebsd.org; Sat, 8 Dec 2007 11:51:26 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 8 Dec 2007 11:51:26 GMT
Message-Id: <200712081151.lB8BpQvD039534@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 130484 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: Sat, 08 Dec 2007 11:51:27 -0000

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

Change 130484 by hselasky@hselasky_laptop001 on 2007/12/08 11:51:08

	
	This commit relates to USB device side support.
	
	In USB device side mode we allow "usbd_do_request_flags"
	to read out the USB descriptors from the USB template
	system for sake of convenience. All other requests are
	not supported and should yield an error.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#68 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#63 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#68 (text+ko) ====

@@ -116,7 +116,7 @@
 
 typedef void (usbd_std_root_transfer_func_t)(struct usbd_xfer *, struct usbd_std_root_transfer *);
 
-typedef const uint8_t *(usbd_temp_get_desc_t)(struct usbd_device *udev, uint16_t langid, uint8_t type, uint8_t index);
+typedef void (usbd_temp_get_desc_t)(struct usbd_device *udev, struct mtx *mtx, usb_device_request_t *req, const void **data, uint16_t *pLen);
 
 /* USB modes */
 

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

@@ -2262,6 +2262,7 @@
 {
 	struct usbd_xfer *xfer;
 	struct usbd_config uc[1];
+	const void *desc;
 	uint32_t level = 0;
 	uint32_t start_ticks;
 	uint32_t delta_ticks;
@@ -2283,6 +2284,24 @@
 	    req->wIndex[1], req->wIndex[0],
 	    req->wLength[1], req->wLength[0]));
 
+	if (udev->usb_mode == USB_MODE_DEVICE) {
+		PRINTFN(0, ("USB device mode\n"));
+		(udev->usb_temp_get_desc) (udev, mtx, req, &desc, &temp);
+		if (desc == NULL) {
+			return (USBD_INVAL);
+		}
+		if (length > temp) {
+			if (!(flags & USBD_SHORT_XFER_OK)) {
+				return (USBD_SHORT_XFER);
+			}
+			length = temp;
+		}
+		if (actlen) {
+			*actlen = length;
+		}
+		bcopy(desc, data, length);
+		return (0);		/* success */
+	}
 	if (actlen) {
 		(*actlen) = 0;
 	}