From owner-p4-projects@FreeBSD.ORG  Wed May 27 20:33:00 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 65A92106572E; Wed, 27 May 2009 20:32:59 +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 1990510656DB
	for <perforce@FreeBSD.org>; Wed, 27 May 2009 20:32:59 +0000 (UTC)
	(envelope-from syl@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 071338FC12
	for <perforce@FreeBSD.org>; Wed, 27 May 2009 20:32:59 +0000 (UTC)
	(envelope-from syl@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4RKWwFd077296
	for <perforce@FreeBSD.org>; Wed, 27 May 2009 20:32:58 GMT
	(envelope-from syl@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4RKWwdT077294
	for perforce@freebsd.org; Wed, 27 May 2009 20:32:58 GMT
	(envelope-from syl@FreeBSD.org)
Date: Wed, 27 May 2009 20:32:58 GMT
Message-Id: <200905272032.n4RKWwdT077294@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	syl@FreeBSD.org using -f
From: Sylvestre Gallon <syl@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 162907 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, 27 May 2009 20:33:01 -0000

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

Change 162907 by syl@syl_rincewind on 2009/05/27 20:32:25

	Fix bugs spotted by Hans Petter Selasky.
	Use libusb20_tr_set_total_frames.
	Best use of libusb20_tr_setup_isoc.

Affected files ...

.. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#14 edit

Differences ...

==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#14 (text+ko) ====

@@ -713,6 +713,7 @@
 	struct timeval *cur_tv;
 	int num_frame;
 	int ret;
+	int i;
 
 	if (xfer == NULL)
 		return (LIBUSB_ERROR_NO_MEM);
@@ -780,8 +781,10 @@
 		libusb20_tr_setup_bulk(usb20_xfer, xfer->buffer, xfer->length, xfer->timeout);
 		break ;
 	case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS:
-		/* what means frindex ? */
-		libusb20_tr_setup_isoc(usb20_xfer, xfer->buffer, xfer->length, 0);
+		libusb20_tr_set_total_frames(usb20_xfer, xfer->num_iso_packets);
+		/* XXX need to check libusb-1.0 for xfer->buffer xfer->length */
+		for (i = 0 ; i < xfer->num_iso_packets ; i++)
+			libusb20_tr_setup_isoc(usb20_xfer, xfer->buffer, xfer->length, i);
 		break ;
 	case LIBUSB_TRANSFER_TYPE_CONTROL:
 		libusb20_tr_setup_control(usb20_xfer, xfer->buffer, 
@@ -790,9 +793,6 @@
 		break ;
 	}
 
-	libusb20_tr_set_timeout(usb20_xfer, xfer->timeout);
-	libusb20_tr_set_buffer(usb20_xfer, xfer->buffer, xfer->num_iso_packets);
-	libusb20_tr_set_length(usb20_xfer, xfer->length, xfer->num_iso_packets);
 	libusb20_tr_set_priv_sc0(usb20_xfer, xfer->callback);
 	libusb20_tr_set_priv_sc1(usb20_xfer, xfer->user_data);
 	libusb20_tr_set_callback(usb20_xfer, libusb10_proxy);