summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorad <ad@NetBSD.org>2007-10-08 16:18:02 +0000
committerad <ad@NetBSD.org>2007-10-08 16:18:02 +0000
commit46ed8f7d77e22cf28fc2ab4cbe00fd197914f3bd (patch)
treec51a0a40bc0996f1db90f94f5b10ca0ff6a34c27 /sys/dev/usb
parentc6deb42c8176c69f73fb873341ff1029fae06886 (diff)
Use the softint API.
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/umidi.c13
-rw-r--r--sys/dev/usb/usb.c11
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c
index 50e3c0ad418..2279a889828 100644
--- a/sys/dev/usb/umidi.c
+++ b/sys/dev/usb/umidi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi.c,v 1.31 2007/07/14 21:02:38 ad Exp $ */
+/* $NetBSD: umidi.c,v 1.32 2007/10/08 16:18:04 ad Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.31 2007/07/14 21:02:38 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.32 2007/10/08 16:18:04 ad Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -53,8 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.31 2007/07/14 21:02:38 ad Exp $");
#include <sys/vnode.h>
#include <sys/poll.h>
#include <sys/lock.h>
-
-#include <machine/intr.h>
+#include <sys/intr.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
@@ -469,7 +468,7 @@ alloc_pipe(struct umidi_endpoint *ep)
err = usbd_open_pipe(sc->sc_iface, ep->addr, 0, &ep->pipe);
if (err)
usbd_free_xfer(ep->xfer);
- ep->solicit_cookie = softintr_establish(IPL_SOFTCLOCK,out_solicit,ep);
+ ep->solicit_cookie = softint_establish(SOFTINT_CLOCK, out_solicit, ep);
quit:
return err;
}
@@ -481,7 +480,7 @@ free_pipe(struct umidi_endpoint *ep)
usbd_abort_pipe(ep->pipe);
usbd_close_pipe(ep->pipe);
usbd_free_xfer(ep->xfer);
- softintr_disestablish(ep->solicit_cookie);
+ softint_disestablish(ep->solicit_cookie);
}
@@ -1519,7 +1518,7 @@ out_jack_output(struct umidi_jack *out_jack, u_char *src, int len, int cin)
* before starting the USB transfer, and send a longer one.
*/
ep->soliciting = 1;
- softintr_schedule(ep->solicit_cookie);
+ softint_schedule(ep->solicit_cookie);
}
splx(s);
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index f0604413064..eacfed663c1 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.99 2007/08/15 04:00:34 kiyohara Exp $ */
+/* $NetBSD: usb.c,v 1.100 2007/10/08 16:18:04 ad Exp $ */
/*
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.99 2007/08/15 04:00:34 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.100 2007/10/08 16:18:04 ad Exp $");
#include "opt_compat_netbsd.h"
@@ -64,6 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.99 2007/08/15 04:00:34 kiyohara Exp $");
#include <sys/select.h>
#include <sys/vnode.h>
#include <sys/signalvar.h>
+#include <sys/intr.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
@@ -206,7 +207,7 @@ USB_ATTACH(usb)
#ifdef USB_USE_SOFTINTR
/* XXX we should have our own level */
- sc->sc_bus->soft = softintr_establish(IPL_SOFTUSB,
+ sc->sc_bus->soft = softint_establish(SOFTINT_NET,
sc->sc_bus->methods->soft_intr, sc->sc_bus);
if (sc->sc_bus->soft == NULL) {
printf("%s: can't register softintr\n", USBDEVNAME(sc->sc_dev));
@@ -875,7 +876,7 @@ usb_schedsoftintr(usbd_bus_handle bus)
if (bus->use_polling) {
bus->methods->soft_intr(bus);
} else {
- softintr_schedule(bus->soft);
+ softint_schedule(bus->soft);
}
#else
bus->methods->soft_intr(bus);
@@ -925,7 +926,7 @@ usb_detach(device_ptr_t self, int flags)
#ifdef USB_USE_SOFTINTR
if (sc->sc_bus->soft != NULL) {
- softintr_disestablish(sc->sc_bus->soft);
+ softint_disestablish(sc->sc_bus->soft);
sc->sc_bus->soft = NULL;
}
#endif