Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the softint API.

Browse Source
This commit is contained in:
ad 2007-10-08 16:18:02 +00:00
parent c6deb42c81
commit 46ed8f7d77
26 changed files with 179 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/pmax/tc/dt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dt.c,v 1.7 2007/03/04 06:00:33 christos Exp $ */
/* $NetBSD: dt.c,v 1.8 2007/10/08 16:18:02 ad Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@ -140,7 +140,7 @@ SOFTWARE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dt.c,v 1.7 2007/03/04 06:00:33 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: dt.c,v 1.8 2007/10/08 16:18:02 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -151,6 +151,7 @@ __KERNEL_RCSID(0, "$NetBSD: dt.c,v 1.7 2007/03/04 06:00:33 christos Exp $");
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/intr.h>
#include <dev/dec/lk201.h>
@ -227,7 +228,7 @@ dt_attach(struct device *parent, struct device *self, void *aux)
return;
}
sc->sc_sih = softintr_establish(IPL_SOFTSERIAL, dt_dispatch, sc);
sc->sc_sih = softint_establish(SOFTINT_SERIAL, dt_dispatch, sc);
if (sc->sc_sih == NULL) {
printf("%s: memory exhausted\n", sc->sc_dv.dv_xname);
free(msg, M_DEVBUF);
@ -316,7 +317,7 @@ dt_intr(void *cookie)
pend = SIMPLEQ_FIRST(&sc->sc_queue);
SIMPLEQ_INSERT_TAIL(&sc->sc_queue, msg, chain.simpleq);
if (pend == NULL)
softintr_schedule(sc->sc_sih);
softint_schedule(sc->sc_sih);
return (1);
}

19
sys/dev/audio.c
View File

@ -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

15
sys/dev/bluetooth/btsco.c
View File

@ -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--;
}

11
sys/dev/dmover/dmover_process.c
View File

@ -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);

13
sys/dev/ic/cd18xx.c
View File

@ -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);

15
sys/dev/ic/clmpcc.c
View File

@ -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;
}

16
sys/dev/ic/smc90cx6.c
View File

@ -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);

12
sys/dev/marvell/gtmpsc.c
View File

@ -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

19
sys/dev/midi.c
View File

@ -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 )

10
sys/dev/sbus/magma.c
View File

@ -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);
}

10
sys/dev/sbus/spif.c
View File

@ -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);
}

12
sys/dev/sbus/stp4020.c
View File

@ -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;
}
}

9
sys/dev/sequencer.c
View File

@ -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;
}

10
sys/dev/tc/zs_ioasic.c
View File

@ -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);
}

13
sys/dev/usb/umidi.c
View File

@ -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);

11
sys/dev/usb/usb.c
View File

@ -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

11
sys/kern/kern_timeout.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_timeout.c,v 1.26 2007/08/01 23:23:41 ad Exp $ */
/* $NetBSD: kern_timeout.c,v 1.27 2007/10/08 16:18:04 ad Exp $ */
/*-
* Copyright (c) 2003, 2006, 2007 The NetBSD Foundation, Inc.
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_timeout.c,v 1.26 2007/08/01 23:23:41 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_timeout.c,v 1.27 2007/10/08 16:18:04 ad Exp $");
/*
* Timeouts are kept in a hierarchical timing wheel. The c_time is the
@ -100,8 +100,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_timeout.c,v 1.26 2007/08/01 23:23:41 ad Exp $")
#include <sys/sleepq.h>
#include <sys/syncobj.h>
#include <sys/evcnt.h>
#include <machine/intr.h>
#include <sys/intr.h>
#ifdef DDB
#include <machine/db_machdep.h>
@ -279,7 +278,7 @@ void
callout_startup2(void)
{
callout_si = softintr_establish(IPL_SOFTCLOCK,
callout_si = softint_establish(SOFTINT_CLOCK | SOFTINT_MPSAFE,
callout_softclock, NULL);
if (callout_si == NULL)
panic("callout_startup2: unable to register softclock intr");
@ -553,7 +552,7 @@ callout_hardclock(void)
mutex_spin_exit(&callout_lock);
if (needsoftclock)
softintr_schedule(callout_si);
softint_schedule(callout_si);
}
/* ARGSUSED */

13
sys/net/if_etherip.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_etherip.c,v 1.13 2007/09/16 02:19:44 dyoung Exp $ */
/* $NetBSD: if_etherip.c,v 1.14 2007/10/08 16:18:04 ad Exp $ */
/*
* Copyright (c) 2006, Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
@ -102,6 +102,7 @@
#include <sys/queue.h>
#include <sys/kauth.h>
#include <sys/socket.h>
#include <sys/intr.h>
#include <net/if.h>
#include <net/if_dl.h>
@ -348,7 +349,7 @@ etherip_start(struct ifnet *ifp)
struct etherip_softc *sc = (struct etherip_softc *)ifp->if_softc;
if(sc->sc_si)
softintr_schedule(sc->sc_si);
softint_schedule(sc->sc_si);
}
static void
@ -517,7 +518,7 @@ etherip_set_tunnel(struct ifnet *ifp,
}
if (sc->sc_si) {
softintr_disestablish(sc->sc_si);
softint_disestablish(sc->sc_si);
sc->sc_si = NULL;
}
@ -536,7 +537,7 @@ etherip_set_tunnel(struct ifnet *ifp,
ifp->if_flags |= IFF_RUNNING;
sc->sc_si = softintr_establish(IPL_SOFTNET, etheripintr, sc);
sc->sc_si = softint_establish(SOFTINT_NET, etheripintr, sc);
if (sc->sc_si == NULL)
error = ENOMEM;
@ -555,7 +556,7 @@ etherip_delete_tunnel(struct ifnet *ifp)
s = splsoftnet();
if (sc->sc_si) {
softintr_disestablish(sc->sc_si);
softint_disestablish(sc->sc_si);
sc->sc_si = NULL;
}
@ -578,7 +579,7 @@ etherip_init(struct ifnet *ifp)
struct etherip_softc *sc = ifp->if_softc;
if (sc->sc_si == NULL)
sc->sc_si = softintr_establish(IPL_SOFTNET, etheripintr, sc);
sc->sc_si = softint_establish(SOFTINT_NET, etheripintr, sc);
if (sc->sc_si == NULL)
return(ENOMEM);

10
sys/net/if_ethersubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ethersubr.c,v 1.155 2007/09/19 05:25:33 dyoung Exp $ */
/* $NetBSD: if_ethersubr.c,v 1.156 2007/10/08 16:18:04 ad Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.155 2007/09/19 05:25:33 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.156 2007/10/08 16:18:04 ad Exp $");
#include "opt_inet.h"
#include "opt_atalk.h"
@ -90,8 +90,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.155 2007/09/19 05:25:33 dyoung Ex
#include <sys/errno.h>
#include <sys/syslog.h>
#include <sys/kauth.h>
#include <machine/cpu.h>
#include <sys/cpu.h>
#include <sys/intr.h>
#include <net/if.h>
#include <net/netisr.h>
@ -797,7 +797,7 @@ ether_input(struct ifnet *ifp, struct mbuf *m)
m_freem(m);
} else
IF_ENQUEUE(inq, m);
softintr_schedule(pppoe_softintr);
softint_schedule(pppoe_softintr);
return;
#endif /* NPPPOE > 0 */
case ETHERTYPE_SLOWPROTOCOLS: {

19
sys/net/if_gif.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_gif.c,v 1.71 2007/09/16 18:09:51 dyoung Exp $ */
/* $NetBSD: if_gif.c,v 1.72 2007/10/08 16:18:05 ad Exp $ */
/* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */
/*
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.71 2007/09/16 18:09:51 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.72 2007/10/08 16:18:05 ad Exp $");
#include "opt_inet.h"
#include "opt_iso.h"
@ -49,9 +49,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.71 2007/09/16 18:09:51 dyoung Exp $");
#include <sys/proc.h>
#include <sys/protosw.h>
#include <sys/kauth.h>
#include <machine/cpu.h>
#include <machine/intr.h>
#include <sys/cpu.h>
#include <sys/intr.h>
#include <net/if.h>
#include <net/if_types.h>
@ -327,7 +326,7 @@ gif_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
}
splx(s);
softintr_schedule(sc->gif_si);
softint_schedule(sc->gif_si);
error = 0;
end:
@ -767,7 +766,7 @@ gif_set_tunnel(struct ifnet *ifp, struct sockaddr *src, struct sockaddr *dst)
}
if (sc->gif_si) {
softintr_disestablish(sc->gif_si);
softint_disestablish(sc->gif_si);
sc->gif_si = NULL;
}
@ -786,7 +785,7 @@ gif_set_tunnel(struct ifnet *ifp, struct sockaddr *src, struct sockaddr *dst)
#endif
}
sc->gif_si = softintr_establish(IPL_SOFTNET, gifintr, sc);
sc->gif_si = softint_establish(SOFTINT_NET, gifintr, sc);
if (sc->gif_si == NULL) {
error = ENOMEM;
goto bad;
@ -837,7 +836,7 @@ gif_set_tunnel(struct ifnet *ifp, struct sockaddr *src, struct sockaddr *dst)
bad:
if (sc->gif_si) {
softintr_disestablish(sc->gif_si);
softint_disestablish(sc->gif_si);
sc->gif_si = NULL;
}
if (sc->gif_psrc && sc->gif_pdst)
@ -858,7 +857,7 @@ gif_delete_tunnel(struct ifnet *ifp)
s = splsoftnet();
if (sc->gif_si) {
softintr_disestablish(sc->gif_si);
softint_disestablish(sc->gif_si);
sc->gif_si = NULL;
}
if (sc->gif_psrc) {

15
sys/net/if_ppp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ppp.c,v 1.117 2007/09/01 04:32:50 dyoung Exp $ */
/* $NetBSD: if_ppp.c,v 1.118 2007/10/08 16:18:05 ad Exp $ */
/* Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp */
/*
@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.117 2007/09/01 04:32:50 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.118 2007/10/08 16:18:05 ad Exp $");
#include "ppp.h"
@ -126,6 +126,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.117 2007/09/01 04:32:50 dyoung Exp $");
#include <sys/malloc.h>
#include <sys/conf.h>
#include <sys/kauth.h>
#include <sys/intr.h>
#include <net/if.h>
#include <net/if_types.h>
@ -135,8 +136,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.117 2007/09/01 04:32:50 dyoung Exp $");
#include <net/bpf.h>
#endif
#include <machine/intr.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/in_var.h>
@ -374,7 +373,7 @@ pppalloc(pid_t pid)
if (sc == NULL)
sc = ppp_create(ppp_cloner.ifc_name, -1);
sc->sc_si = softintr_establish(IPL_SOFTNET, pppintr, sc);
sc->sc_si = softint_establish(SOFTINT_NET, pppintr, sc);
if (sc->sc_si == NULL) {
printf("%s: unable to establish softintr\n", sc->sc_if.if_xname);
return (NULL);
@ -410,7 +409,7 @@ pppdealloc(struct ppp_softc *sc)
{
struct mbuf *m;
softintr_disestablish(sc->sc_si);
softint_disestablish(sc->sc_si);
if_down(&sc->sc_if);
sc->sc_if.if_flags &= ~(IFF_UP|IFF_RUNNING);
sc->sc_devp = NULL;
@ -1109,7 +1108,7 @@ ppp_restart(struct ppp_softc *sc)
int s = splhigh(); /* XXX IMP ME HARDER */
sc->sc_flags &= ~SC_TBUSY;
softintr_schedule(sc->sc_si);
softint_schedule(sc->sc_si);
splx(s);
}
@ -1414,7 +1413,7 @@ ppppktin(struct ppp_softc *sc, struct mbuf *m, int lost)
if (lost)
m->m_flags |= M_ERRMARK;
IF_ENQUEUE(&sc->sc_rawq, m);
softintr_schedule(sc->sc_si);
softint_schedule(sc->sc_si);
splx(s);
}

9
sys/net/if_pppoe.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_pppoe.c,v 1.80 2007/09/09 09:58:55 martin Exp $ */
/* $NetBSD: if_pppoe.c,v 1.81 2007/10/08 16:18:05 ad Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.80 2007/09/09 09:58:55 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.81 2007/10/08 16:18:05 ad Exp $");
#include "pppoe.h"
#include "bpfilter.h"
@ -54,6 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.80 2007/09/09 09:58:55 martin Exp $")
#include <sys/proc.h>
#include <sys/ioctl.h>
#include <sys/kauth.h>
#include <sys/intr.h>
#include <net/if.h>
#include <net/if_types.h>
#include <net/if_ether.h>
@ -65,7 +67,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.80 2007/09/09 09:58:55 martin Exp $")
#include <net/bpf.h>
#endif
#include <machine/intr.h>
#undef PPPOE_DEBUG /* XXX - remove this or make it an option */
/* #define PPPOE_DEBUG 1 */
@ -215,7 +216,7 @@ pppoeattach(int count)
LIST_INIT(&pppoe_softc_list);
if_clone_attach(&pppoe_cloner);
pppoe_softintr = softintr_establish(IPL_SOFTNET, pppoe_softintr_handler, NULL);
pppoe_softintr = softint_establish(SOFTINT_NET, pppoe_softintr_handler, NULL);
}
static int

21
sys/net/if_sl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_sl.c,v 1.107 2007/09/01 04:32:50 dyoung Exp $ */
/* $NetBSD: if_sl.c,v 1.108 2007/10/08 16:18:05 ad Exp $ */
/*
* Copyright (c) 1987, 1989, 1992, 1993
@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.107 2007/09/01 04:32:50 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.108 2007/10/08 16:18:05 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@ -81,9 +81,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.107 2007/09/01 04:32:50 dyoung Exp $");
#include <sys/systm.h>
#include <sys/kauth.h>
#endif
#include <machine/cpu.h>
#include <machine/intr.h>
#include <sys/cpu.h>
#include <sys/intr.h>
#include <net/if.h>
#include <net/if_types.h>
@ -314,12 +313,12 @@ slopen(dev_t dev, struct tty *tp)
LIST_FOREACH(sc, &sl_softc_list, sc_iflist)
if (sc->sc_ttyp == NULL) {
sc->sc_si = softintr_establish(IPL_SOFTNET,
sc->sc_si = softint_establish(SOFTINT_NET,
slintr, sc);
if (sc->sc_si == NULL)
return ENOMEM;
if (slinit(sc) == 0) {
softintr_disestablish(sc->sc_si);
softint_disestablish(sc->sc_si);
return ENOBUFS;
}
tp->t_sc = (void *)sc;
@ -347,7 +346,7 @@ slopen(dev_t dev, struct tty *tp)
error = clalloc(&tp->t_outq, 2 * SLMAX + 2, 0);
if (error) {
splx(s);
softintr_disestablish(sc->sc_si);
softint_disestablish(sc->sc_si);
/*
* clalloc() might return -1 which
* is no good, so we need to return
@ -378,7 +377,7 @@ slclose(struct tty *tp, int flag)
sc = tp->t_sc;
if (sc != NULL) {
softintr_disestablish(sc->sc_si);
softint_disestablish(sc->sc_si);
s = splnet();
if_down(&sc->sc_if);
IF_PURGE(&sc->sc_fastq);
@ -543,7 +542,7 @@ slstart(struct tty *tp)
*/
if (sc == NULL)
return 0;
softintr_schedule(sc->sc_si);
softint_schedule(sc->sc_si);
return 0;
}
@ -660,7 +659,7 @@ slinput(int c, struct tty *tp)
goto error;
IF_ENQUEUE(&sc->sc_inq, m);
softintr_schedule(sc->sc_si);
softint_schedule(sc->sc_si);
goto newpack;
}
if (sc->sc_mp < sc->sc_ep) {

21
sys/net/if_strip.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_strip.c,v 1.82 2007/09/29 18:44:51 scw Exp $ */
/* $NetBSD: if_strip.c,v 1.83 2007/10/08 16:18:05 ad Exp $ */
/* from: NetBSD: if_sl.c,v 1.38 1996/02/13 22:00:23 christos Exp $ */
/*
@ -87,7 +87,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.82 2007/09/29 18:44:51 scw Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.83 2007/10/08 16:18:05 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@ -109,9 +109,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.82 2007/09/29 18:44:51 scw Exp $");
#include <sys/kauth.h>
#endif
#include <sys/syslog.h>
#include <machine/cpu.h>
#include <machine/intr.h>
#include <sys/cpu.h>
#include <sys/intr.h>
#include <net/if.h>
#include <net/if_dl.h>
@ -488,10 +487,10 @@ stripopen(dev_t dev, struct tty *tp)
LIST_FOREACH(sc, &strip_softc_list, sc_iflist) {
if (sc->sc_ttyp == NULL) {
sc->sc_si = softintr_establish(IPL_SOFTNET,
sc->sc_si = softint_establish(SOFTINT_NET,
stripintr, sc);
if (stripinit(sc) == 0) {
softintr_disestablish(sc->sc_si);
softint_disestablish(sc->sc_si);
return (ENOBUFS);
}
tp->t_sc = (void *)sc;
@ -516,7 +515,7 @@ stripopen(dev_t dev, struct tty *tp)
error = clalloc(&tp->t_outq, 3*SLMTU, 0);
if (error) {
splx(s);
softintr_disestablish(sc->sc_si);
softint_disestablish(sc->sc_si);
/*
* clalloc() might return -1 which
* is no good, so we need to return
@ -558,7 +557,7 @@ stripclose(struct tty *tp, int flag)
sc = tp->t_sc;
if (sc != NULL) {
softintr_disestablish(sc->sc_si);
softint_disestablish(sc->sc_si);
s = splnet();
/*
* Cancel watchdog timer, which stops the "probe-for-death"/
@ -911,7 +910,7 @@ stripstart(struct tty *tp)
*/
if (sc == NULL)
return (0);
softintr_schedule(sc->sc_si);
softint_schedule(sc->sc_si);
return (0);
}
@ -1042,7 +1041,7 @@ stripinput(int c, struct tty *tp)
goto error;
IF_ENQUEUE(&sc->sc_inq, m);
softintr_schedule(sc->sc_si);
softint_schedule(sc->sc_si);
goto newpack;
error:

19
sys/netbt/hci_unit.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hci_unit.c,v 1.4 2007/03/30 20:47:03 plunky Exp $ */
/* $NetBSD: hci_unit.c,v 1.5 2007/10/08 16:18:05 ad Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hci_unit.c,v 1.4 2007/03/30 20:47:03 plunky Exp $");
__KERNEL_RCSID(0, "$NetBSD: hci_unit.c,v 1.5 2007/10/08 16:18:05 ad Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -42,6 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: hci_unit.c,v 1.4 2007/03/30 20:47:03 plunky Exp $");
#include <sys/proc.h>
#include <sys/queue.h>
#include <sys/systm.h>
#include <sys/intr.h>
#include <netbt/bluetooth.h>
#include <netbt/hci.h>
@ -123,7 +124,7 @@ hci_enable(struct hci_unit *unit)
unit->hci_acl_mask = HCI_PKT_DM1 | HCI_PKT_DH1;
unit->hci_packet_type = unit->hci_acl_mask;
unit->hci_rxint = softintr_establish(IPL_SOFTNET, &hci_intr, unit);
unit->hci_rxint = softint_establish(SOFTINT_NET, &hci_intr, unit);
if (unit->hci_rxint == NULL)
return EIO;
@ -168,7 +169,7 @@ bad2:
splx(s);
bad1:
softintr_disestablish(unit->hci_rxint);
softint_disestablish(unit->hci_rxint);
unit->hci_rxint = NULL;
return err;
@ -187,7 +188,7 @@ hci_disable(struct hci_unit *unit)
}
if (unit->hci_rxint) {
softintr_disestablish(unit->hci_rxint);
softint_disestablish(unit->hci_rxint);
unit->hci_rxint = NULL;
}
@ -395,7 +396,7 @@ hci_input_event(struct hci_unit *unit, struct mbuf *m)
} else {
unit->hci_eventqlen++;
MBUFQ_ENQUEUE(&unit->hci_eventq, m);
softintr_schedule(unit->hci_rxint);
softint_schedule(unit->hci_rxint);
}
}
@ -410,7 +411,7 @@ hci_input_acl(struct hci_unit *unit, struct mbuf *m)
} else {
unit->hci_aclrxqlen++;
MBUFQ_ENQUEUE(&unit->hci_aclrxq, m);
softintr_schedule(unit->hci_rxint);
softint_schedule(unit->hci_rxint);
}
}
@ -425,7 +426,7 @@ hci_input_sco(struct hci_unit *unit, struct mbuf *m)
} else {
unit->hci_scorxqlen++;
MBUFQ_ENQUEUE(&unit->hci_scorxq, m);
softintr_schedule(unit->hci_rxint);
softint_schedule(unit->hci_rxint);
}
}
@ -508,6 +509,6 @@ hci_complete_sco(struct hci_unit *unit, struct mbuf *m)
m_freem(m);
} else {
MBUFQ_ENQUEUE(&unit->hci_scodone, m);
softintr_schedule(unit->hci_rxint);
softint_schedule(unit->hci_rxint);
}
}

13
sys/opencrypto/crypto.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: crypto.c,v 1.20 2007/07/09 21:11:31 ad Exp $ */
/* $NetBSD: crypto.c,v 1.21 2007/10/08 16:18:05 ad Exp $ */
/* $FreeBSD: src/sys/opencrypto/crypto.c,v 1.4.2.5 2003/02/26 00:14:05 sam Exp $ */
/* $OpenBSD: crypto.c,v 1.41 2002/07/17 23:52:38 art Exp $ */
@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.20 2007/07/09 21:11:31 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.21 2007/10/08 16:18:05 ad Exp $");
/* XXX FIXME: should be defopt'ed */
#define CRYPTO_TIMING /* enable cryptop timing stuff */
@ -35,11 +35,12 @@ __KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.20 2007/07/09 21:11:31 ad Exp $");
#include <sys/malloc.h>
#include <sys/proc.h>
#include <sys/pool.h>
#include <opencrypto/cryptodev.h>
#include <sys/kthread.h>
#include <sys/once.h>
#include <sys/sysctl.h>
#include <sys/intr.h>
#include <opencrypto/cryptodev.h>
#include <opencrypto/xform.h> /* XXX for M_XDATA */
#ifdef __NetBSD__
@ -47,9 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.20 2007/07/09 21:11:31 ad Exp $");
/* below is kludges to check whats still missing */
#define SWI_CRYPTO 17
#define register_swi(lvl, fn) \
softintr_establish(IPL_SOFTNET, (void (*)(void*))fn, NULL)
#define unregister_swi(lvl, fn) softintr_disestablish(softintr_cookie)
#define setsoftcrypto(x) softintr_schedule(x)
softint_establish(SOFTINT_NET, (void (*)(void*))fn, NULL)
#define unregister_swi(lvl, fn) softint_disestablish(softintr_cookie)
#define setsoftcrypto(x) softint_schedule(x)
#endif
#define SESID2HID(sid) (((sid) >> 32) & 0xffffffff)