summaryrefslogtreecommitdiff
path: root/sys/dev/bluetooth
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/bluetooth
parentc6deb42c8176c69f73fb873341ff1029fae06886 (diff)
Use the softint API.
Diffstat (limited to 'sys/dev/bluetooth')
-rw-r--r--sys/dev/bluetooth/btsco.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/dev/bluetooth/btsco.c b/sys/dev/bluetooth/btsco.c
index 95d63cfee0f..a088a1aa67a 100644
--- a/sys/dev/bluetooth/btsco.c
+++ b/sys/dev/bluetooth/btsco.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btsco.c,v 1.14 2007/04/21 06:15:22 plunky Exp $ */
+/* $NetBSD: btsco.c,v 1.15 2007/10/08 16:18:02 ad Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.14 2007/04/21 06:15:22 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.15 2007/10/08 16:18:02 ad Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -45,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.14 2007/04/21 06:15:22 plunky Exp $");
#include <sys/mbuf.h>
#include <sys/proc.h>
#include <sys/systm.h>
+#include <sys/intr.h>
#include <prop/proplib.h>
@@ -318,9 +319,9 @@ btsco_attach(struct device *parent, struct device *self, void *aux)
/*
* set up transmit interrupt
*/
- sc->sc_intr = softintr_establish(IPL_SOFTNET, btsco_intr, sc);
+ sc->sc_intr = softint_establish(SOFTINT_NET, btsco_intr, sc);
if (sc->sc_intr == NULL) {
- aprint_error("%s: softintr_establish failed\n",
+ aprint_error("%s: softint_establish failed\n",
device_xname((struct device *)sc));
return;
}
@@ -366,7 +367,7 @@ btsco_detach(struct device *self, int flags)
}
if (sc->sc_intr != NULL) {
- softintr_disestablish(sc->sc_intr);
+ softint_disestablish(sc->sc_intr);
sc->sc_intr = NULL;
}
@@ -789,7 +790,7 @@ btsco_start_output(void *hdl, void *block, int blksize,
sc->sc_tx_intr = intr;
sc->sc_tx_intrarg = intrarg;
- softintr_schedule(sc->sc_intr);
+ softint_schedule(sc->sc_intr);
return 0;
}
@@ -1173,7 +1174,7 @@ btsco_extfree(struct mbuf *m, void *addr, size_t size,
struct btsco_softc *sc = arg;
if (m != NULL)
- pool_cache_put(&mbpool_cache, m);
+ pool_cache_put(&mbpool_cache, m);
sc->sc_tx_refcnt--;
}