From owner-p4-projects@FreeBSD.ORG  Mon Jul 17 11:00:45 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F0CB216A53F; Mon, 17 Jul 2006 11:00:44 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C4C8E16A53D
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 11:00:44 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5EFAB43D46
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 11:00:44 +0000 (GMT)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6HB0iZ1074041
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 11:00:44 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6HB0h5Y074038
	for perforce@freebsd.org; Mon, 17 Jul 2006 11:00:43 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 17 Jul 2006 11:00:43 GMT
Message-Id: <200607171100.k6HB0h5Y074038@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 101746 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: Mon, 17 Jul 2006 11:00:45 -0000

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

Change 101746 by hselasky@hselasky_mini_itx on 2006/07/17 11:00:18

	Allow the clear-stall routines to work with the
	USBD_USE_DMA flag, which means that the USB transfer
	does not have a virtual buffer, xfer->buffer, only the 
	DMA buffer.

Affected files ...

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

Differences ...

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

@@ -1262,19 +1262,35 @@
 usbd_clear_stall_tr_setup(struct usbd_xfer *xfer1, 
 			  struct usbd_xfer *xfer2)
 {
-	usb_device_request_t *req = xfer1->buffer;
+	usb_device_request_t req;
 
 	mtx_assert(xfer1->priv_mtx, MA_OWNED);
 	mtx_assert(xfer2->priv_mtx, MA_OWNED);
 
 	/* setup a clear-stall packet */
 
-	req->bmRequestType = UT_WRITE_ENDPOINT;
-	req->bRequest = UR_CLEAR_FEATURE;
-	USETW(req->wValue, UF_ENDPOINT_HALT);
-	req->wIndex[0] = xfer2->pipe->edesc->bEndpointAddress;
-	req->wIndex[1] = 0;
-	USETW(req->wLength, 0);
+	req.bmRequestType = UT_WRITE_ENDPOINT;
+	req.bRequest = UR_CLEAR_FEATURE;
+	USETW(req.wValue, UF_ENDPOINT_HALT);
+	req.wIndex[0] = xfer2->pipe->edesc->bEndpointAddress;
+	req.wIndex[1] = 0;
+	USETW(req.wLength, 0);
+
+	/* double check the length */
+
+	if (xfer1->length != sizeof(req)) {
+	    printf("%s:%d: invalid transfer length, %d bytes!\n",
+		   __FUNCTION__, __LINE__, xfer1->length);
+	    return;
+	}
+
+	/* copy in the transfer */
+
+	if (xfer1->flags & USBD_USE_DMA) {
+	    usbd_copy_in(&(xfer1->buf_data), 0, &req, sizeof(req));
+	} else {
+	    bcopy(&req, xfer1->buffer, sizeof(req));
+	}
 
 	usbd_start_hardware(xfer1);
 	return;