From owner-p4-projects@FreeBSD.ORG  Mon Jun 15 17:22:41 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2B27E106568D; Mon, 15 Jun 2009 17:22:41 +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 DE41B106567B
	for <perforce@FreeBSD.org>; Mon, 15 Jun 2009 17:22:40 +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 CC0058FC40
	for <perforce@FreeBSD.org>; Mon, 15 Jun 2009 17:22:40 +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 n5FHMelw012523
	for <perforce@FreeBSD.org>; Mon, 15 Jun 2009 17:22:40 GMT
	(envelope-from syl@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5FHMe54012521
	for perforce@freebsd.org; Mon, 15 Jun 2009 17:22:40 GMT
	(envelope-from syl@FreeBSD.org)
Date: Mon, 15 Jun 2009 17:22:40 GMT
Message-Id: <200906151722.n5FHMe54012521@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 164434 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: Mon, 15 Jun 2009 17:22:42 -0000

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

Change 164434 by syl@syl_atuin on 2009/06/15 17:21:57

	- fix libusb20_tr_get_pointer following Hans Petter Advices.
	- Update debug.

Affected files ...

.. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb.h#11 edit
.. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#35 edit
.. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.h#7 edit

Differences ...

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

@@ -177,6 +177,7 @@
 };
 
 enum libusb_debug_level {
+	LIBUSB_DEBUG_NO=0,
 	LIBUSB_DEBUG_FUNCTION=1,
 };
 

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

@@ -1036,9 +1036,9 @@
 	pthread_mutex_unlock(&ctx->flying_transfers_lock);
 
 	usb20_xfer[0] = libusb20_tr_get_pointer(pdev, 
-	    (4 * xfer->endpoint) | (xfer->endpoint / 0x40));
+	    ((xfer->endpoint / 0x40) | (xfer->endpoint * 4)) % (16 * 4));
 	usb20_xfer[1] = libusb20_tr_get_pointer(pdev,
-	    ((4 * xfer->endpoint) | (xfer->endpoint / 0x40)) + 1);
+	    (((xfer->endpoint / 0x40) | (xfer->endpoint * 4)) % (16 * 4)) + 1);
 	
 	if (usb20_xfer[0] == NULL)
 		return (LIBUSB_ERROR_OTHER);

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

@@ -87,6 +87,8 @@
 dprintf(libusb_context *ctx, int debug, char *str)
 {
 	switch (ctx->debug) {
+	case LIBUSB_DEBUG_NO:
+		break ;
 	case LIBUSB_DEBUG_FUNCTION:
 		printf("LIBUSB FUNCTION : %s\n", str); 
 		break ;