From owner-p4-projects@FreeBSD.ORG  Sun Jun 14 18:31:12 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9F0021065672; Sun, 14 Jun 2009 18:31:12 +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 5F1D6106564A
	for <perforce@FreeBSD.org>; Sun, 14 Jun 2009 18:31:12 +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 4D4A78FC12
	for <perforce@FreeBSD.org>; Sun, 14 Jun 2009 18:31:12 +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 n5EIVBRJ059253
	for <perforce@FreeBSD.org>; Sun, 14 Jun 2009 18:31:11 GMT
	(envelope-from syl@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5EIVBC4059251
	for perforce@freebsd.org; Sun, 14 Jun 2009 18:31:11 GMT
	(envelope-from syl@FreeBSD.org)
Date: Sun, 14 Jun 2009 18:31:11 GMT
Message-Id: <200906141831.n5EIVBC4059251@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 164366 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, 14 Jun 2009 18:31:13 -0000

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

Change 164366 by syl@syl_atuin on 2009/06/14 18:31:10

	       - Remove current transfer from flying_list on TRANSFER_COMPLETE.
	       - Call libusb_transfer->callback on TRANSFER_COMPLETE.

Affected files ...

.. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#31 edit
.. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_io.c#11 edit

Differences ...

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

@@ -680,22 +680,32 @@
 static void
 libusb10_proxy(struct libusb20_transfer *xfer)
 {
+	struct usb_transfer *usb_backend;
+	libusb_transfer *usb_xfer;
+	libusb_context *ctx;
 	uint8_t status;
-	libusb_transfer *usb_xfer;
+
+	usb_backend = (struct usb_transfer *) ((uint8_t *)xfer - 
+	    sizeof(struct usb_transfer));
 
 	pthread_mutex_lock(&libusb20_lock);
 
 	status = libusb20_tr_get_status(xfer);
-	usb_xfer = (libusb_transfer *)libusb20_tr_get_priv_sc0(xfer);
+	usb_xfer = libusb20_tr_get_priv_sc0(xfer);
+	ctx = usb_xfer->dev_handle->dev->ctx;
 
 	switch (status) {
 	case LIBUSB20_TRANSFER_COMPLETED:
 		usb_xfer->actual_length += libusb20_tr_get_actual_length(xfer);
+		usb_xfer->callback(usb_xfer);
+		
+		pthread_mutex_lock(&ctx->flying_transfers_lock);
+		LIST_DEL(&usb_backend->list);
+		pthread_mutex_unlock(&ctx->flying_transfers_lock);
 		break ;
 	case LIBUSB20_TRANSFER_START:
 		usb_xfer->actual_length = 0;
-		switch (usb_xfer->type)
-		{
+		switch (usb_xfer->type) {
 			case LIBUSB_TRANSFER_TYPE_CONTROL:
 				libusb20_tr_setup_control(xfer, usb_xfer->buffer,
 				    (void *)(((uint8_t *) usb_xfer->buffer) + 

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