From owner-p4-projects@FreeBSD.ORG  Sun Dec  2 01:02:46 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 921BE16A41A; Sun,  2 Dec 2007 01:02:46 +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 3321A16A418
	for <perforce@FreeBSD.org>; Sun,  2 Dec 2007 01:02:46 +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 08BAA13C45A
	for <perforce@FreeBSD.org>; Sun,  2 Dec 2007 01:02:46 +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 lB212jp1020314
	for <perforce@FreeBSD.org>; Sun, 2 Dec 2007 01:02:45 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB212jhI020310
	for perforce@freebsd.org; Sun, 2 Dec 2007 01:02:45 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 2 Dec 2007 01:02:45 GMT
Message-Id: <200712020102.lB212jhI020310@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 129939 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: Sun, 02 Dec 2007 01:02:46 -0000

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

Change 129939 by hselasky@hselasky_laptop001 on 2007/12/02 01:02:00

	
	Update UMASS driver;
	
	1) "flags.bdma_enable" was removed. Use "flags.ext_buffer" instead.
	2) "usbd_set_frame_data()" does no longer take a length argument.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/umass.c#34 edit

Differences ...

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

@@ -123,7 +123,7 @@
 
 #if 0
 /* this enables loading of virtual buffers into DMA */
-#define	UMASS_USB_FLAGS .bdma_enable=1,.ext_buffer=1,
+#define	UMASS_USB_FLAGS .ext_buffer=1,
 #else
 #define	UMASS_USB_FLAGS
 #endif
@@ -1900,7 +1900,7 @@
 
 	switch (USBD_GET_STATE(xfer)) {
 	case USBD_ST_TRANSFERRED:
-		if (!xfer->flags.bdma_enable) {
+		if (!xfer->flags.ext_buffer) {
 			usbd_copy_out(xfer->frbuffers + 0, 0,
 			    sc->sc_transfer.data_ptr, xfer->actlen);
 		}
@@ -1926,9 +1926,8 @@
 		xfer->timeout = sc->sc_transfer.data_timeout;
 		xfer->frlengths[0] = max_bulk;
 
-		if (xfer->flags.bdma_enable) {
-			usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr,
-			    max_bulk, 0);
+		if (xfer->flags.ext_buffer) {
+			usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, 0);
 		}
 		usbd_start_hardware(xfer);
 		return;
@@ -1982,9 +1981,8 @@
 		xfer->timeout = sc->sc_transfer.data_timeout;
 		xfer->frlengths[0] = max_bulk;
 
-		if (xfer->flags.bdma_enable) {
-			usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr,
-			    max_bulk, 0);
+		if (xfer->flags.ext_buffer) {
+			usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, 0);
 		} else {
 			usbd_copy_in(xfer->frbuffers + 0, 0,
 			    sc->sc_transfer.data_ptr, max_bulk);
@@ -2403,7 +2401,7 @@
 
 	switch (USBD_GET_STATE(xfer)) {
 	case USBD_ST_TRANSFERRED:
-		if (!xfer->flags.bdma_enable) {
+		if (!xfer->flags.ext_buffer) {
 			usbd_copy_out(xfer->frbuffers + 0, 0,
 			    sc->sc_transfer.data_ptr, xfer->actlen);
 		}
@@ -2481,9 +2479,8 @@
 		}
 		xfer->timeout = sc->sc_transfer.data_timeout;
 
-		if (xfer->flags.bdma_enable) {
-			usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr,
-			    max_bulk, 0);
+		if (xfer->flags.ext_buffer) {
+			usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, 0);
 		} else {
 			usbd_copy_in(xfer->frbuffers + 0, 0,
 			    sc->sc_transfer.data_ptr, max_bulk);