Tue Jan 22 13:18:47 2013 UTC ()

Use usbd_setup_pipe_flags instead of usbd_setup_pipe so the supplied flags
get passed through.


(jmcneill)

diff -r1.148 -r1.149 src/sys/dev/usb/usbdi.c

--- src/sys/dev/usb/usbdi.c 2013/01/22 12:40:43	1.148
+++ src/sys/dev/usb/usbdi.c 2013/01/22 13:18:47	1.149

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbdi.c,v 1.148 2013/01/22 12:40:43 jmcneill Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.149 2013/01/22 13:18:47 jmcneill Exp $	*/
 /*
  * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology and Matthew R. Green (mrg@eterna.com.au).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.148 2013/01/22 12:40:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.149 2013/01/22 13:18:47 jmcneill Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 @@ -167,48 +167,48 @@ usbd_open_pipe_ival(usbd_interface_handl
 		    iface, address, flags));
 	for (i = 0; i < iface->idesc->bNumEndpoints; i++) {
 		ep = &iface->endpoints[i];
 		if (ep->edesc == NULL)
 			return (USBD_IOERROR);
 		if (ep->edesc->bEndpointAddress == address)
 			goto found;
+	}
 	return (USBD_BAD_ADDRESS);
  found:
 	if ((flags & USBD_EXCLUSIVE_USE) && ep->refcnt != 0)
 		return (USBD_IN_USE);
-	err = usbd_setup_pipe(iface->device, iface, ep, ival, &p);
+	err = usbd_setup_pipe_flags(iface->device, iface, ep, ival, &p, flags);
 	if (err)
 		return (err);
 	LIST_INSERT_HEAD(&iface->pipes, p, next);
 	*pipe = p;
 	return (USBD_NORMAL_COMPLETION);
+}
 usbd_status
 usbd_open_pipe_intr(usbd_interface_handle iface, u_int8_t address,
 		    u_int8_t flags, usbd_pipe_handle *pipe,
 		    usbd_private_handle priv, void *buffer, u_int32_t len,
 		    usbd_callback cb, int ival)
+{
 	usbd_status err;
 	usbd_xfer_handle xfer;
 	usbd_pipe_handle ipipe;
 	DPRINTFN(3,("usbd_open_pipe_intr: address=0x%x flags=0x%x len=%d\n",
 		    address, flags, len));
-	err = usbd_open_pipe_ival(iface, address, USBD_EXCLUSIVE_USE,
+	err = usbd_open_pipe_ival(iface, address, USBD_EXCLUSIVE_USE | flags,
 				  &ipipe, ival);
 	if (err)
 		return (err);
 	xfer = usbd_alloc_xfer(iface->device);
 	if (xfer == NULL) {
 		err = USBD_NOMEM;
 		goto bad1;
+	}
 	usbd_setup_xfer(xfer, ipipe, priv, buffer, len, flags,
 	    USBD_NO_TIMEOUT, cb);
 	ipipe->intrxfer = xfer;
 	ipipe->repeat = 1;
 	err = usbd_transfer(xfer);