 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbdi.c,v 1.149 2013/01/22 13:18:47 jmcneill Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.150 2013/01/22 13:27:59 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.149 2013/01/22 13:18:47 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.150 2013/01/22 13:27:59 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>
 @@ -188,27 +188,28 @@ usbd_open_pipe_ival(usbd_interface_handl
 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 | flags,
+	err = usbd_open_pipe_ival(iface, address,
 				  USBD_EXCLUSIVE_USE | (flags & USBD_MPSAFE),
 				  &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);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbdi.h,v 1.86 2013/01/22 12:48:07 jmcneill Exp $	*/
+/*	$NetBSD: usbdi.h,v 1.87 2013/01/22 13:27:59 jmcneill Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $	*/
 /*
  * Copyright (c) 1998 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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -61,27 +61,27 @@ typedef enum {		/* keep in sync with usb
 	USBD_TIMEOUT,		/* 15 */
 	USBD_SHORT_XFER,	/* 16 */
 	USBD_STALLED,		/* 17 */
 	USBD_INTERRUPTED,	/* 18 */
 	USBD_ERROR_MAX		/* must be last */
 } usbd_status;
 typedef void (*usbd_callback)(usbd_xfer_handle, usbd_private_handle,
 			      usbd_status);
 /* Open flags */
 #define USBD_EXCLUSIVE_USE	0x01
-#define USBD_MPSAFE		0x02
+#define USBD_MPSAFE		0x80
 /* Use default (specified by ep. desc.) interval on interrupt pipe */
 #define USBD_DEFAULT_INTERVAL	(-1)
 /* Request flags */
 #define USBD_NO_COPY		0x01	/* do not copy data to DMA buffer */
 #define USBD_SYNCHRONOUS	0x02	/* wait for completion */
 /* in usb.h #define USBD_SHORT_XFER_OK	0x04*/	/* allow short reads */
 #define USBD_FORCE_SHORT_XFER	0x08	/* force last short packet on write */
 #define USBD_SYNCHRONOUS_SIG	0x10	/* if waiting for completion,
 					 * also take signals */
 #define USBD_NO_TIMEOUT 0
 @@ -199,27 +199,27 @@ void usbd_clear_endpoint_stall_async_cb(
  * perform (short) tasks that must have a process context.
  */
 struct usb_task {
 	TAILQ_ENTRY(usb_task) next;
 	void (*fun)(void *);
 	void *arg;
 	int queue;
 	int flags;
 };
 #define	USB_TASKQ_HC		0
 #define	USB_TASKQ_DRIVER	1
 #define	USB_NUM_TASKQS		2
 #define	USB_TASKQ_NAMES		{"usbtask-hc", "usbtask-dr"}
-#define	USB_TASKQ_MPSAFE	0x02
+#define	USB_TASKQ_MPSAFE	0x80
 void usb_add_task(usbd_device_handle, struct usb_task *, int);
 void usb_rem_task(usbd_device_handle, struct usb_task *);
 #define usb_init_task(t, f, a, fl) ((t)->fun = (f), (t)->arg = (a), (t)->queue = -1, (t)->flags = (fl))
 struct usb_devno {
 	u_int16_t ud_vendor;
 	u_int16_t ud_product;
 };
 const struct usb_devno *usb_match_device(const struct usb_devno *,
 	u_int, u_int, u_int16_t, u_int16_t);
 #define usb_lookup(tbl, vendor, product) \
 	usb_match_device((const struct usb_devno *)(tbl), sizeof (tbl) / sizeof ((tbl)[0]), sizeof ((tbl)[0]), (vendor), (product))