From owner-p4-projects@FreeBSD.ORG  Wed May 23 19:34:46 2007
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 CD9AC16A468; Wed, 23 May 2007 19:34:45 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 79C2316A41F
	for <perforce@FreeBSD.org>; Wed, 23 May 2007 19:34:45 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 6AC4813C45D
	for <perforce@FreeBSD.org>; Wed, 23 May 2007 19:34:45 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4NJYjVP094254
	for <perforce@FreeBSD.org>; Wed, 23 May 2007 19:34:45 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4NJYjYF094244
	for perforce@freebsd.org; Wed, 23 May 2007 19:34:45 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 23 May 2007 19:34:45 GMT
Message-Id: <200705231934.l4NJYjYF094244@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 120273 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, 23 May 2007 19:34:46 -0000

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

Change 120273 by hselasky@hselasky_mini_itx on 2007/05/23 19:34:39

	When we are writing data to a Mass Storage Device,
	short write transfers should not be treated like
	errors.

Affected files ...

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

Differences ...

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

@@ -780,7 +780,7 @@
       .endpoint  = -1, /* any */
       .direction = UE_DIR_OUT,
       .bufsize   = UMASS_BULK_SIZE,
-      .flags     = USBD_USE_DMA,
+      .flags     = (USBD_USE_DMA|USBD_SHORT_XFER_OK),
       .callback  = &umass_t_bbb_data_write_callback,
       .timeout   = 0, /* overwritten later */
     },
@@ -875,7 +875,7 @@
       .endpoint  = -1, /* any */
       .direction = UE_DIR_OUT,
       .bufsize   = UMASS_BULK_SIZE,
-      .flags     = USBD_USE_DMA,
+      .flags     = (USBD_USE_DMA|USBD_SHORT_XFER_OK),
       .callback  = &umass_t_cbi_data_write_callback,
       .timeout   = 0, /* overwritten later */
     },
@@ -1635,6 +1635,11 @@
 	sc->sc_transfer.data_ptr += xfer->actlen;
 	sc->sc_transfer.actlen += xfer->actlen;
 
+	if (xfer->actlen < xfer->length) {
+	    /* short transfer */
+	    sc->sc_transfer.data_rem = 0;
+	}
+
  tr_setup:
 	DPRINTF(sc, UDMASS_BBB, "max_bulk=%d, data_rem=%d\n",
 		max_bulk, sc->sc_transfer.data_rem);
@@ -2134,6 +2139,11 @@
 	sc->sc_transfer.data_ptr += xfer->actlen;
 	sc->sc_transfer.actlen += xfer->actlen;
 
+	if (xfer->actlen < xfer->length) {
+	    /* short transfer */
+	    sc->sc_transfer.data_rem = 0;
+	}
+
  tr_setup:
 	DPRINTF(sc, UDMASS_CBI, "max_bulk=%d, data_rem=%d\n",
 		max_bulk, sc->sc_transfer.data_rem);