From owner-svn-src-user@FreeBSD.ORG  Wed Sep 22 20:07:03 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 43D60106564A;
	Wed, 22 Sep 2010 20:07:03 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 34C9F8FC13;
	Wed, 22 Sep 2010 20:07:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8MK73xj041862;
	Wed, 22 Sep 2010 20:07:03 GMT (envelope-from weongyo@svn.freebsd.org)
Received: (from weongyo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8MK73sY041860;
	Wed, 22 Sep 2010 20:07:03 GMT (envelope-from weongyo@svn.freebsd.org)
Message-Id: <201009222007.o8MK73sY041860@svn.freebsd.org>
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Wed, 22 Sep 2010 20:07:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213022 - user/weongyo/usb/sys/dev/usb
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Sep 2010 20:07:03 -0000

Author: weongyo
Date: Wed Sep 22 20:07:02 2010
New Revision: 213022
URL: http://svn.freebsd.org/changeset/base/213022

Log:
  Calculates the remained buffer if pc->ismultiseg == 1.  According to the
  current implementation the last segment should be handled carefully
  because its position could vary.

Modified:
  user/weongyo/usb/sys/dev/usb/usb_busdma.c

Modified: user/weongyo/usb/sys/dev/usb/usb_busdma.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_busdma.c	Wed Sep 22 20:04:03 2010	(r213021)
+++ user/weongyo/usb/sys/dev/usb/usb_busdma.c	Wed Sep 22 20:07:02 2010	(r213022)
@@ -82,7 +82,7 @@ usbd_get_page(struct usb_page_cache *pc,
     struct usb_page_search *res)
 {
 	struct usb_page *page;
-	usb_frlength_t offset = offset0;
+	usb_frlength_t end, offset = offset0;
 	int index;
 
 #if USB_HAVE_BUSDMA
@@ -104,7 +104,17 @@ usbd_get_page(struct usb_page_cache *pc,
 			    ("invalid index number (%d / %d)", index,
 			    pc->npages));
 			offset %= USB_PAGE_SIZE;
-			res->length = USB_PAGE_SIZE - offset;
+			/* If it's the last segment handle differently */
+			if ((index + 1) != pc->npages)
+				res->length = USB_PAGE_SIZE - offset;
+			else {
+				end = page[index].physlen;
+				if (index == 0)
+					end += pc->page_offset_buf;
+				USB_ASSERT(end >= offset,
+				    ("wrong offset (%d / %d)", end, offset));
+				res->length = end - offset;
+			}
 			res->physaddr = page[index].physaddr + offset;
 		} else {
 			USB_ASSERT(pc->npages == 1,