From owner-svn-src-user@FreeBSD.ORG  Sat Nov 13 21:17:53 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 7BDF4106566C;
	Sat, 13 Nov 2010 21:17:53 +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 6AE4D8FC18;
	Sat, 13 Nov 2010 21:17:53 +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 oADLHrKS060111;
	Sat, 13 Nov 2010 21:17:53 GMT (envelope-from weongyo@svn.freebsd.org)
Received: (from weongyo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oADLHr6v060109;
	Sat, 13 Nov 2010 21:17:53 GMT (envelope-from weongyo@svn.freebsd.org)
Message-Id: <201011132117.oADLHr6v060109@svn.freebsd.org>
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Sat, 13 Nov 2010 21:17:53 +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: r215261 - 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: Sat, 13 Nov 2010 21:17:53 -0000

Author: weongyo
Date: Sat Nov 13 21:17:53 2010
New Revision: 215261
URL: http://svn.freebsd.org/changeset/base/215261

Log:
  For ISOC xfers it need to handle it specially because unlike other
  transfer modes it just use only one linear buffers.
  
  Reviewed by:	hps

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

Modified: user/weongyo/usb/sys/dev/usb/usb_pf.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_pf.c	Sat Nov 13 21:09:18 2010	(r215260)
+++ user/weongyo/usb/sys/dev/usb/usb_pf.c	Sat Nov 13 21:17:53 2010	(r215261)
@@ -1673,6 +1673,7 @@ usbpf_xfertap(struct usb_xfer *xfer, int
 	struct usb_xfer_root *info = xfer->xroot;
 	struct usb_bus *bus = info->bus;
 	struct usbpf_pkthdr *up;
+	usb_frlength_t isoc_offset = 0;
 	int i;
 	char *buf, *ptr, *end;
 
@@ -1730,7 +1731,11 @@ usbpf_xfertap(struct usb_xfer *xfer, int
 
 		if (ptr + xfer->frlengths[i] >= end)
 			goto done;
-		usbd_get_page(&xfer->frbuffers[i], 0, &res);
+		if ((xfer->status & XFER_STATUS_ISOCXFER) != 0) {
+			usbd_get_page(&xfer->frbuffers[0], isoc_offset, &res);
+			isoc_offset += xfer->frlengths[i];
+		} else
+			usbd_get_page(&xfer->frbuffers[i], 0, &res);
 		bcopy(res.buffer, ptr, xfer->frlengths[i]);
 		ptr += xfer->frlengths[i];
 	}