diff options
| author | ad <ad@NetBSD.org> | 2007-10-08 16:18:02 +0000 |
|---|---|---|
| committer | ad <ad@NetBSD.org> | 2007-10-08 16:18:02 +0000 |
| commit | 46ed8f7d77e22cf28fc2ab4cbe00fd197914f3bd (patch) | |
| tree | c51a0a40bc0996f1db90f94f5b10ca0ff6a34c27 /sys/dev | |
| parent | c6deb42c8176c69f73fb873341ff1029fae06886 (diff) | |
Use the softint API.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/audio.c | 19 | ||||
| -rw-r--r-- | sys/dev/bluetooth/btsco.c | 15 | ||||
| -rw-r--r-- | sys/dev/dmover/dmover_process.c | 11 | ||||
| -rw-r--r-- | sys/dev/ic/cd18xx.c | 13 | ||||
| -rw-r--r-- | sys/dev/ic/clmpcc.c | 15 | ||||
| -rw-r--r-- | sys/dev/ic/smc90cx6.c | 16 | ||||
| -rw-r--r-- | sys/dev/marvell/gtmpsc.c | 12 | ||||
| -rw-r--r-- | sys/dev/midi.c | 19 | ||||
| -rw-r--r-- | sys/dev/sbus/magma.c | 10 | ||||
| -rw-r--r-- | sys/dev/sbus/spif.c | 10 | ||||
| -rw-r--r-- | sys/dev/sbus/stp4020.c | 12 | ||||
| -rw-r--r-- | sys/dev/sequencer.c | 9 | ||||
| -rw-r--r-- | sys/dev/tc/zs_ioasic.c | 10 | ||||
| -rw-r--r-- | sys/dev/usb/umidi.c | 13 | ||||
| -rw-r--r-- | sys/dev/usb/usb.c | 11 |
15 files changed, 99 insertions, 96 deletions
diff --git a/sys/dev/audio.c b/sys/dev/audio.c index a33dcf26fbf..06c8dd70665 100644 --- a/sys/dev/audio.c +++ b/sys/dev/audio.c @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.223 2007/08/14 21:34:03 uwe Exp $ */ +/* $NetBSD: audio.c,v 1.224 2007/10/08 16:18:02 ad Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.223 2007/08/14 21:34:03 uwe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.224 2007/10/08 16:18:02 ad Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -81,6 +81,7 @@ __KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.223 2007/08/14 21:34:03 uwe Exp $"); #include <sys/conf.h> #include <sys/audioio.h> #include <sys/device.h> +#include <sys/intr.h> #include <dev/audio_if.h> #include <dev/audiovar.h> @@ -336,9 +337,9 @@ audioattach(struct device *parent, struct device *self, void *aux) return; } - sc->sc_sih_rd = softintr_establish(IPL_SOFTSERIAL, + sc->sc_sih_rd = softint_establish(SOFTINT_SERIAL, audio_softintr_rd, sc); - sc->sc_sih_wr = softintr_establish(IPL_SOFTSERIAL, + sc->sc_sih_wr = softint_establish(SOFTINT_SERIAL, audio_softintr_wr, sc); iclass = mclass = oclass = rclass = -1; @@ -531,11 +532,11 @@ audiodetach(struct device *self, int flags) sc->sc_powerhook = NULL; } if (sc->sc_sih_rd) { - softintr_disestablish(sc->sc_sih_rd); + softint_disestablish(sc->sc_sih_rd); sc->sc_sih_rd = NULL; } if (sc->sc_sih_wr) { - softintr_disestablish(sc->sc_sih_wr); + softint_disestablish(sc->sc_sih_wr); sc->sc_sih_wr = NULL; } @@ -2681,12 +2682,12 @@ audio_pint(void *v) audio_stream_get_used(sc->sc_pustream), cb->usedlow)); if ((sc->sc_mode & AUMODE_PLAY) && !cb->pause) { if (audio_stream_get_used(sc->sc_pustream) <= cb->usedlow) - softintr_schedule(sc->sc_sih_wr); + softint_schedule(sc->sc_sih_wr); } /* Possible to return one or more "phantom blocks" now. */ if (!sc->sc_full_duplex && sc->sc_rchan) - softintr_schedule(sc->sc_sih_rd); + softint_schedule(sc->sc_sih_rd); } /* @@ -2791,7 +2792,7 @@ audio_rint(void *v) } } - softintr_schedule(sc->sc_sih_rd); + softint_schedule(sc->sc_sih_rd); } int 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--; } diff --git a/sys/dev/dmover/dmover_process.c b/sys/dev/dmover/dmover_process.c index 4deb18409eb..965d179ac9c 100644 --- a/sys/dev/dmover/dmover_process.c +++ b/sys/dev/dmover/dmover_process.c @@ -1,4 +1,4 @@ -/* $NetBSD: dmover_process.c,v 1.2 2003/03/06 21:32:59 thorpej Exp $ */ +/* $NetBSD: dmover_process.c,v 1.3 2007/10/08 16:18:03 ad Exp $ */ /* * Copyright (c) 2002 Wasabi Systems, Inc. @@ -40,13 +40,12 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dmover_process.c,v 1.2 2003/03/06 21:32:59 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dmover_process.c,v 1.3 2007/10/08 16:18:03 ad Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> - -#include <machine/intr.h> +#include <sys/intr.h> #include <dev/dmover/dmovervar.h> @@ -69,7 +68,7 @@ dmover_process_initialize(void) TAILQ_INIT(&dmover_completed_q); simple_lock_init(&dmover_completed_q_slock); - dmover_completed_si = softintr_establish(IPL_SOFTCLOCK, + dmover_completed_si = softint_establish(SOFTINT_CLOCK, dmover_complete, NULL); } @@ -153,7 +152,7 @@ dmover_done(struct dmover_request *dreq) simple_lock(&dmover_completed_q_slock); TAILQ_INSERT_TAIL(&dmover_completed_q, dreq, dreq_dmbq); simple_unlock(&dmover_completed_q_slock); - softintr_schedule(dmover_completed_si); + softint_schedule(dmover_completed_si); } else if (dreq->dreq_flags & DMOVER_REQ_WAIT) wakeup(dreq); diff --git a/sys/dev/ic/cd18xx.c b/sys/dev/ic/cd18xx.c index 27167118b99..90be8aca9bf 100644 --- a/sys/dev/ic/cd18xx.c +++ b/sys/dev/ic/cd18xx.c @@ -1,4 +1,4 @@ -/* $NetBSD: cd18xx.c,v 1.19 2007/03/04 06:01:51 christos Exp $ */ +/* $NetBSD: cd18xx.c,v 1.20 2007/10/08 16:18:03 ad Exp $ */ /* XXXad does this even compile? */ @@ -103,7 +103,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cd18xx.c,v 1.19 2007/03/04 06:01:51 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd18xx.c,v 1.20 2007/10/08 16:18:03 ad Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -115,6 +115,7 @@ __KERNEL_RCSID(0, "$NetBSD: cd18xx.c,v 1.19 2007/03/04 06:01:51 christos Exp $") #include <sys/tty.h> #include <sys/fcntl.h> #include <sys/kauth.h> +#include <sys/intr.h> #include <machine/bus.h> @@ -288,7 +289,7 @@ cd18xx_attach(sc) cd18xx_write(sc, CD18xx_PPRL, sc->sc_pprl); /* establish our soft interrupt. */ - sc->sc_si = softintr_establish(IPL_SOFTSERIAL, cd18xx_softintr, sc); + sc->sc_si = softint_establish(SOFTINT_SERIAL, cd18xx_softintr, sc); printf(", 8 ports ready (chip id %d)\n", sc->sc_chip_id); @@ -954,7 +955,7 @@ cdttyparam(tp, t) p->p_r_lowat = 0; if (ISSET(p->p_rx_flags, RX_TTY_OVERFLOWED)) { CLR(p->p_rx_flags, RX_TTY_OVERFLOWED); - softintr_schedule(sc->sc_si); + softint_schedule(sc->sc_si); } if (ISSET(p->p_rx_flags, RX_TTY_BLOCKED|RX_IBUF_BLOCKED)) { CLR(p->p_rx_flags, RX_TTY_BLOCKED|RX_IBUF_BLOCKED); @@ -1064,7 +1065,7 @@ cdttyhwiflow(tp, block) } else { if (ISSET(p->p_rx_flags, RX_TTY_OVERFLOWED)) { CLR(p->p_rx_flags, RX_TTY_OVERFLOWED); - softintr_schedule(sc->sc_si); + softint_schedule(sc->sc_si); } if (ISSET(p->p_rx_flags, RX_TTY_BLOCKED)) { CLR(p->p_rx_flags, RX_TTY_BLOCKED); @@ -1387,7 +1388,7 @@ cd18xx_hardintr(v) } } if (ns) - softintr_schedule(sc->sc_si); + softint_schedule(sc->sc_si); } return (rv); diff --git a/sys/dev/ic/clmpcc.c b/sys/dev/ic/clmpcc.c index d2eb7a33e1d..c44a241fef1 100644 --- a/sys/dev/ic/clmpcc.c +++ b/sys/dev/ic/clmpcc.c @@ -1,4 +1,4 @@ -/* $NetBSD: clmpcc.c,v 1.33 2007/07/14 21:02:36 ad Exp $ */ +/* $NetBSD: clmpcc.c,v 1.34 2007/10/08 16:18:03 ad Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clmpcc.c,v 1.33 2007/07/14 21:02:36 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clmpcc.c,v 1.34 2007/10/08 16:18:03 ad Exp $"); #include "opt_ddb.h" @@ -60,9 +60,9 @@ __KERNEL_RCSID(0, "$NetBSD: clmpcc.c,v 1.33 2007/07/14 21:02:36 ad Exp $"); #include <sys/device.h> #include <sys/malloc.h> #include <sys/kauth.h> +#include <sys/intr.h> #include <machine/bus.h> -#include <machine/intr.h> #include <machine/param.h> #include <dev/ic/clmpccreg.h> @@ -308,7 +308,7 @@ clmpcc_attach(sc) (clmpcc_rd_msvr(sc) & CLMPCC_MSVR_PORT_ID) ? '0' : '1'); sc->sc_softintr_cookie = - softintr_establish(IPL_SOFTSERIAL, clmpcc_softintr, sc); + softint_establish(SOFTINT_SERIAL, clmpcc_softintr, sc); if (sc->sc_softintr_cookie == NULL) panic("clmpcc_attach: softintr_establish"); memset(&(sc->sc_chans[0]), 0, sizeof(sc->sc_chans)); @@ -1240,7 +1240,7 @@ rx_done: } clmpcc_wrreg(sc, CLMPCC_REG_REOIR, 0); - softintr_schedule(sc->sc_softintr_cookie); + softint_schedule(sc->sc_softintr_cookie); } else clmpcc_wrreg(sc, CLMPCC_REG_REOIR, CLMPCC_REOIR_NO_TRANS); @@ -1360,7 +1360,7 @@ clmpcc_txintr(arg) * Request Tx processing in the soft interrupt handler */ ch->ch_tx_done = 1; - softintr_schedule(sc->sc_softintr_cookie); + softint_schedule(sc->sc_softintr_cookie); } clmpcc_wrreg(sc, CLMPCC_REG_IER, tir); @@ -1397,8 +1397,7 @@ clmpcc_mdintr(arg) clmpcc_rd_msvr(sc) & CLMPCC_MSVR_CD; clmpcc_wrreg(sc, CLMPCC_REG_MEOIR, 0); - - softintr_schedule(sc->sc_softintr_cookie); + softint_schedule(sc->sc_softintr_cookie); return 1; } diff --git a/sys/dev/ic/smc90cx6.c b/sys/dev/ic/smc90cx6.c index d9c444e95a0..0402c31d450 100644 --- a/sys/dev/ic/smc90cx6.c +++ b/sys/dev/ic/smc90cx6.c @@ -1,4 +1,4 @@ -/* $NetBSD: smc90cx6.c,v 1.50 2007/09/03 11:32:07 he Exp $ */ +/* $NetBSD: smc90cx6.c,v 1.51 2007/10/08 16:18:03 ad Exp $ */ /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.50 2007/09/03 11:32:07 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.51 2007/10/08 16:18:03 ad Exp $"); /* #define BAHSOFTCOPY */ #define BAHRETRANSMIT /**/ @@ -60,6 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.50 2007/09/03 11:32:07 he Exp $"); #include <sys/syslog.h> #include <sys/ioctl.h> #include <sys/errno.h> +#include <sys/kernel.h> +#include <sys/intr.h> #include <net/if.h> #include <net/if_dl.h> @@ -79,10 +81,8 @@ __KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.50 2007/09/03 11:32:07 he Exp $"); #include <net/bpfdesc.h> #endif -#include <sys/kernel.h> #include <machine/bus.h> #include <machine/cpu.h> -#include <machine/intr.h> #include <machine/mtpr.h> #include <dev/ic/smc90cx6reg.h> @@ -215,8 +215,8 @@ bah_attach_subr(sc) arc_ifattach(ifp, linkaddress); #ifdef BAHSOFTCOPY - sc->sc_rxcookie = softintr_establish(IPL_SOFTNET, bah_srint, sc); - sc->sc_txcookie = softintr_establish(IPL_SOFTNET, + sc->sc_rxcookie = softint_establish(SOFTINT_NET, bah_srint, sc); + sc->sc_txcookie = softint_establish(SOFTINT_NET, (void (*)(void *))bah_start, ifp); #endif @@ -737,7 +737,7 @@ bah_tint(sc, isr) /* XXXX TODO */ #ifdef BAHSOFTCOPY /* schedule soft int to fill a new buffer for us */ - softintr_schedule(sc->sc_txcookie); + softint_schedule(sc->sc_txcookie); #else /* call it directly */ bah_start(ifp); @@ -870,7 +870,7 @@ bahintr(arg) * this one starts a soft int to copy out * of the hw */ - softintr_schedule(sc->sc_rxcookie); + softint_schedule(sc->sc_rxcookie); #else /* this one does the copy here */ bah_srint(sc); diff --git a/sys/dev/marvell/gtmpsc.c b/sys/dev/marvell/gtmpsc.c index b573eb06fba..92b36128442 100644 --- a/sys/dev/marvell/gtmpsc.c +++ b/sys/dev/marvell/gtmpsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: gtmpsc.c,v 1.23 2007/03/04 06:02:14 christos Exp $ */ +/* $NetBSD: gtmpsc.c,v 1.24 2007/10/08 16:18:03 ad Exp $ */ /* * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.23 2007/03/04 06:02:14 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.24 2007/10/08 16:18:03 ad Exp $"); #include "opt_kgdb.h" @@ -514,9 +514,9 @@ gtmpscattach(struct device *parent, struct device *self, void *aux) panic("mpscattach: cannot intr_establish IRQ_SDMA"); } - sc->sc_si = softintr_establish(IPL_SOFTSERIAL, gtmpsc_softintr, sc); + sc->sc_si = softint_establish(SOFTINT_SERIAL, gtmpsc_softintr, sc); if (sc->sc_si == NULL) - panic("mpscattach: cannot softintr_establish IPL_SOFTSERIAL"); + panic("mpscattach: cannot softint_establish IPL_SOFTSERIAL"); shutdownhook_establish(gtmpsc_shutdownhook, sc); @@ -988,7 +988,7 @@ skip_kgdb: if (sc->sc_tbc == 0 && sc->sc_tx_busy) { sc->sc_tx_busy = 0; sc->sc_tx_done = 1; - softintr_schedule(sc->sc_si); + softint_schedule(sc->sc_si); SDMA_IMASK_DISABLE(sc, SDMA_INTR_TXBUF(unit)); } } @@ -1742,7 +1742,7 @@ gtmpsc_poll(void *arg) } #endif if (kick) - softintr_schedule(sc->sc_si); + softint_schedule(sc->sc_si); } #ifdef KGDB diff --git a/sys/dev/midi.c b/sys/dev/midi.c index 5b326924941..f9309a51164 100644 --- a/sys/dev/midi.c +++ b/sys/dev/midi.c @@ -1,4 +1,4 @@ -/* $NetBSD: midi.c,v 1.55 2007/07/09 21:00:29 ad Exp $ */ +/* $NetBSD: midi.c,v 1.56 2007/10/08 16:18:02 ad Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.55 2007/07/09 21:00:29 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.56 2007/10/08 16:18:02 ad Exp $"); #include "midi.h" #include "sequencer.h" @@ -59,6 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.55 2007/07/09 21:00:29 ad Exp $"); #include <sys/conf.h> #include <sys/audioio.h> #include <sys/midiio.h> +#include <sys/intr.h> #include <dev/audio_if.h> #include <dev/midi_if.h> @@ -214,11 +215,11 @@ mididetach(struct device *self, int flags) } if (sc->sih_rd != NULL) { - softintr_disestablish(sc->sih_rd); + softint_disestablish(sc->sih_rd); sc->sih_rd = NULL; } if (sc->sih_wr != NULL) { - softintr_disestablish(sc->sih_wr); + softint_disestablish(sc->sih_wr); sc->sih_wr = NULL; } @@ -242,8 +243,8 @@ midi_attach(struct midi_softc *sc, struct device *parent) sc->sc_dev = parent; - sc->sih_rd = softintr_establish(IPL_SOFTSERIAL, midi_softintr_rd, sc); - sc->sih_wr = softintr_establish(IPL_SOFTSERIAL, midi_softintr_wr, sc); + sc->sih_rd = softint_establish(SOFTINT_SERIAL, midi_softintr_rd, sc); + sc->sih_wr = softint_establish(SOFTINT_SERIAL, midi_softintr_wr, sc); s = splaudio(); simple_lock(&hwif_register_lock); @@ -784,7 +785,7 @@ sxp_again: MIDI_BUF_PRODUCER_WBACK(mb,buf); MIDI_BUF_PRODUCER_WBACK(mb,idx); MIDI_IN_UNLOCK(sc,s); - softintr_schedule(sc->sih_rd); + softint_schedule(sc->sih_rd); break; default: /* don't #ifdef this away, gcc will say FST_HUH not handled */ printf("midi_in: midi_fst returned %d?!\n", got); @@ -1027,7 +1028,7 @@ midi_rcv_asense(void *arg) sc->rcv_quiescent = 0; sc->rcv_expect_asense = 0; MIDI_IN_UNLOCK(sc,s); - softintr_schedule(sc->sih_rd); + softint_schedule(sc->sih_rd); return; } @@ -1304,7 +1305,7 @@ midi_intr_out(struct midi_softc *sc) callout_schedule(&sc->xmt_asense_co, MIDI_XMT_ASENSE_PERIOD); } MIDI_OUT_UNLOCK(sc,s); - softintr_schedule(sc->sih_wr); + softint_schedule(sc->sih_wr); #if defined(AUDIO_DEBUG) || defined(DIAGNOSTIC) if ( error ) diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c index 12177820f84..9ac4f3c6a04 100644 --- a/sys/dev/sbus/magma.c +++ b/sys/dev/sbus/magma.c @@ -1,4 +1,4 @@ -/* $NetBSD: magma.c,v 1.42 2007/08/12 17:53:01 macallan Exp $ */ +/* $NetBSD: magma.c,v 1.43 2007/10/08 16:18:03 ad Exp $ */ /* * magma.c * @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.42 2007/08/12 17:53:01 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.43 2007/10/08 16:18:03 ad Exp $"); #if 0 #define MAGMA_DEBUG @@ -61,9 +61,9 @@ __KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.42 2007/08/12 17:53:01 macallan Exp $"); #include <sys/conf.h> #include <sys/errno.h> #include <sys/kauth.h> +#include <sys/intr.h> #include <machine/bus.h> -#include <machine/intr.h> #include <machine/autoconf.h> #include <dev/sbus/sbusvar.h> @@ -492,7 +492,7 @@ magma_attach(parent, self, aux) (void)bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_SERIAL, magma_hard, sc); - sc->ms_sicookie = softintr_establish(IPL_SOFTSERIAL, magma_soft, sc); + sc->ms_sicookie = softint_establish(SOFTINT_SERIAL, magma_soft, sc); if (sc->ms_sicookie == NULL) { printf("\n%s: cannot establish soft int handler\n", sc->ms_dev.dv_xname); @@ -720,7 +720,7 @@ magma_hard(arg) if (needsoftint) /* trigger the soft interrupt */ - softintr_schedule(sc->ms_sicookie); + softint_schedule(sc->ms_sicookie); return(serviced); } diff --git a/sys/dev/sbus/spif.c b/sys/dev/sbus/spif.c index d8c7652ad5c..4c100ea7741 100644 --- a/sys/dev/sbus/spif.c +++ b/sys/dev/sbus/spif.c @@ -1,4 +1,4 @@ -/* $NetBSD: spif.c,v 1.10 2007/03/04 06:02:41 christos Exp $ */ +/* $NetBSD: spif.c,v 1.11 2007/10/08 16:18:03 ad Exp $ */ /* $OpenBSD: spif.c,v 1.12 2003/10/03 16:44:51 miod Exp $ */ /* @@ -41,7 +41,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.10 2007/03/04 06:02:41 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.11 2007/10/08 16:18:03 ad Exp $"); #include "spif.h" #if NSPIF > 0 @@ -60,9 +60,9 @@ __KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.10 2007/03/04 06:02:41 christos Exp $"); #include <sys/conf.h> #include <sys/errno.h> #include <sys/kauth.h> +#include <sys/intr.h> #include <machine/bus.h> -#include <machine/intr.h> #include <machine/autoconf.h> #include <machine/promlib.h> @@ -220,7 +220,7 @@ spif_attach(parent, self, aux) goto fail_unmapregs; } - sc->sc_softih = softintr_establish(IPL_TTY, spif_softintr, sc); + sc->sc_softih = softint_establish(SOFTINT_SERIAL, spif_softintr, sc); if (sc->sc_softih == NULL) { printf(": can't get soft intr\n"); goto fail_unmapregs; @@ -929,7 +929,7 @@ spif_stcintr(vsc) } if (needsoft) - softintr_schedule(sc->sc_softih); + softint_schedule(sc->sc_softih); return (r); } diff --git a/sys/dev/sbus/stp4020.c b/sys/dev/sbus/stp4020.c index 0e4bab4a749..c67553b05b7 100644 --- a/sys/dev/sbus/stp4020.c +++ b/sys/dev/sbus/stp4020.c @@ -1,4 +1,4 @@ -/* $NetBSD: stp4020.c,v 1.50 2007/07/09 21:01:21 ad Exp $ */ +/* $NetBSD: stp4020.c,v 1.51 2007/10/08 16:18:03 ad Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.50 2007/07/09 21:01:21 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.51 2007/10/08 16:18:03 ad Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -52,13 +52,13 @@ __KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.50 2007/07/09 21:01:21 ad Exp $"); #include <sys/kernel.h> #include <sys/kthread.h> #include <sys/device.h> +#include <sys/intr.h> #include <dev/pcmcia/pcmciareg.h> #include <dev/pcmcia/pcmciavar.h> #include <dev/pcmcia/pcmciachip.h> #include <machine/bus.h> -#include <machine/intr.h> #include <dev/sbus/sbusvar.h> #include <dev/sbus/stp4020reg.h> @@ -715,7 +715,7 @@ stp4020_intr(arg) * handler */ if (h->softint != NULL) - softintr_schedule(h->softint); + softint_schedule(h->softint); /* * Disable this sbus interrupt, until the soft-int * handler had a chance to run @@ -1073,7 +1073,7 @@ stp4020_chip_intr_establish(pch, pf, ipl, handler, arg) h->intrhandler = handler; h->intrarg = arg; - h->softint = softintr_establish(ipl, stp4020_intr_dispatch, h); + h->softint = softint_establish(ipl, stp4020_intr_dispatch, h); return h->softint; } @@ -1087,7 +1087,7 @@ stp4020_chip_intr_disestablish(pch, ih) h->intrhandler = NULL; h->intrarg = NULL; if (h->softint) { - softintr_disestablish(h->softint); + softint_disestablish(h->softint); h->softint = NULL; } } diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c index 70e782f8fc0..759882aa768 100644 --- a/sys/dev/sequencer.c +++ b/sys/dev/sequencer.c @@ -1,4 +1,4 @@ -/* $NetBSD: sequencer.c,v 1.41 2007/07/09 21:00:29 ad Exp $ */ +/* $NetBSD: sequencer.c,v 1.42 2007/10/08 16:18:02 ad Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.41 2007/07/09 21:00:29 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.42 2007/10/08 16:18:02 ad Exp $"); #include "sequencer.h" @@ -57,6 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.41 2007/07/09 21:00:29 ad Exp $"); #include <sys/audioio.h> #include <sys/midiio.h> #include <sys/device.h> +#include <sys/intr.h> #include <dev/midi_if.h> #include <dev/midivar.h> @@ -148,7 +149,7 @@ sequencerattach(int n) for (n = 0; n < NSEQUENCER; n++) { sc = &seqdevs[n]; callout_init(&sc->sc_callout, 0); - sc->sih = softintr_establish(IPL_SOFTSERIAL, seq_softintr, sc); + sc->sih = softint_establish(SOFTINT_SERIAL, seq_softintr, sc); } } @@ -348,7 +349,7 @@ seq_input_event(struct sequencer_softc *sc, seq_event_t *cmd) if (SEQ_QFULL(q)) return (ENOMEM); SEQ_QPUT(q, *cmd); - softintr_schedule(sc->sih); + softint_schedule(sc->sih); return 0; } diff --git a/sys/dev/tc/zs_ioasic.c b/sys/dev/tc/zs_ioasic.c index bfeb3103610..cbe75132c79 100644 --- a/sys/dev/tc/zs_ioasic.c +++ b/sys/dev/tc/zs_ioasic.c @@ -1,4 +1,4 @@ -/* $NetBSD: zs_ioasic.c,v 1.32 2006/05/10 06:24:03 skrll Exp $ */ +/* $NetBSD: zs_ioasic.c,v 1.33 2007/10/08 16:18:04 ad Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.32 2006/05/10 06:24:03 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.33 2007/10/08 16:18:04 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -66,9 +66,9 @@ __KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.32 2006/05/10 06:24:03 skrll Exp $") #include <sys/tty.h> #include <sys/time.h> #include <sys/syslog.h> +#include <sys/intr.h> #include <machine/autoconf.h> -#include <machine/intr.h> #include <machine/z8530var.h> #include <dev/cons.h> @@ -329,7 +329,7 @@ zs_ioasic_attach(struct device *parent, struct device *self, void *aux) */ ioasic_intr_establish(parent, d->iada_cookie, TC_IPL_TTY, zs_ioasic_hardintr, zs); - zs->zsc_sih = softintr_establish(IPL_SOFTSERIAL, + zs->zsc_sih = softint_establish(SOFTINT_SERIAL, zs_ioasic_softintr, zs); if (zs->zsc_sih == NULL) panic("zs_ioasic_attach: unable to register softintr"); @@ -430,7 +430,7 @@ zs_ioasic_hardintr(void *arg) * processing interrupts. */ if (zsc->zsc_cs[0]->cs_softreq | zsc->zsc_cs[1]->cs_softreq) - softintr_schedule(zsc->zsc_sih); + softint_schedule(zsc->zsc_sih); return (1); } 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 |
