From owner-p4-projects@FreeBSD.ORG  Tue Nov  4 18:34:46 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BFAC6106568B; Tue,  4 Nov 2008 18:34:46 +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 83CEB1065686
	for <perforce@FreeBSD.org>; Tue,  4 Nov 2008 18:34:46 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 714508FC16
	for <perforce@FreeBSD.org>; Tue,  4 Nov 2008 18:34:46 +0000 (UTC)
	(envelope-from hselasky@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 mA4IYkvF039499
	for <perforce@FreeBSD.org>; Tue, 4 Nov 2008 18:34:46 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA4IYkGF039497
	for perforce@freebsd.org; Tue, 4 Nov 2008 18:34:46 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 4 Nov 2008 18:34:46 GMT
Message-Id: <200811041834.mA4IYkGF039497@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 152476 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: Tue, 04 Nov 2008 18:34:47 -0000

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

Change 152476 by hselasky@hselasky_laptop001 on 2008/11/04 18:34:37

	
	Some USB drivers do not pass the endpoint direction
	mask correctly to the libusb API functions. Force
	correct endpoint direction.

Affected files ...

.. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#5 edit

Differences ...

==== //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#5 (text+ko) ====

@@ -131,7 +131,7 @@
 	x = (ep_no & LIBUSB20_ENDPOINT_ADDRESS_MASK) * 2;
 
 	if (ep_no & LIBUSB20_ENDPOINT_DIR_MASK) {
-		/* this is a IN endpoint */
+		/* this is an IN endpoint */
 		x |= 1;
 	}
 	speed = libusb20_dev_get_speed(pdev);
@@ -616,28 +616,32 @@
 usb_bulk_write(usb_dev_handle * dev, int ep, char *bytes,
     int size, int timeout)
 {
-	return (usb_std_io(dev, ep, bytes, size, timeout, 0));
+	return (usb_std_io(dev, ep & ~USB_ENDPOINT_DIR_MASK,
+	    bytes, size, timeout, 0));
 }
 
 int
 usb_bulk_read(usb_dev_handle * dev, int ep, char *bytes,
     int size, int timeout)
 {
-	return (usb_std_io(dev, ep, bytes, size, timeout, 0));
+	return (usb_std_io(dev, ep | USB_ENDPOINT_DIR_MASK,
+	    bytes, size, timeout, 0));
 }
 
 int
 usb_interrupt_write(usb_dev_handle * dev, int ep, char *bytes,
     int size, int timeout)
 {
-	return (usb_std_io(dev, ep, bytes, size, timeout, 1));
+	return (usb_std_io(dev, ep & ~USB_ENDPOINT_DIR_MASK,
+	    bytes, size, timeout, 1));
 }
 
 int
 usb_interrupt_read(usb_dev_handle * dev, int ep, char *bytes,
     int size, int timeout)
 {
-	return (usb_std_io(dev, ep, bytes, size, timeout, 1));
+	return (usb_std_io(dev, ep | USB_ENDPOINT_DIR_MASK,
+	    bytes, size, timeout, 1));
 }
 
 int