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

Remove the `flags' argument from bus_intr_establish().

This commit is contained in:
pk 2002-12-10 13:44:47 +00:00
parent 6e91aedc2d
commit 725a6aebf7
45 changed files with 128 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/sparc/dev/audioamd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: audioamd.c,v 1.15 2002/12/10 12:11:22 pk Exp $ */
/* $NetBSD: audioamd.c,v 1.16 2002/12/10 13:44:49 pk Exp $ */
/* NetBSD: am7930_sparc.c,v 1.44 1999/03/14 22:29:00 jonathan Exp */
/*
@ -309,7 +309,7 @@ audioamd_attach(sc, pri)
/* Copy bus tag & handle for use by am7930_trap */
sc->sc_au.au_bt = sc->sc_bt;
sc->sc_au.au_bh = sc->sc_bh;
(void)bus_intr_establish2(sc->sc_bt, pri, IPL_AUDIO, 0,
(void)bus_intr_establish2(sc->sc_bt, pri, IPL_AUDIO,
am7930hwintr, sc, amd7930_trap);
sc->sc_sicookie = softintr_establish(IPL_SOFTAUDIO, am7930swintr, sc);

4
sys/arch/sparc/dev/com_ebus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_ebus.c,v 1.8 2002/10/08 18:00:46 uwe Exp $ */
/* $NetBSD: com_ebus.c,v 1.9 2002/12/10 13:44:49 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -122,6 +122,6 @@ com_ebus_attach(parent, self, aux)
if (ea->ea_nintr != 0)
(void)bus_intr_establish(sc->sc_iot,
ea->ea_intr[0], IPL_SERIAL, 0,
ea->ea_intr[0], IPL_SERIAL,
comintr, sc);
}

4
sys/arch/sparc/dev/com_obio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_obio.c,v 1.12 2002/10/02 16:02:14 thorpej Exp $ */
/* $NetBSD: com_obio.c,v 1.13 2002/12/10 13:44:49 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -222,7 +222,7 @@ com_obio_attach(parent, self, aux)
if (sa->sa_nintr != 0) {
(void)bus_intr_establish(sc->sc_iot, sa->sa_pri, IPL_SERIAL,
0, comintr, sc);
comintr, sc);
evcnt_attach_dynamic(&osc->osc_intrcnt, EVCNT_TYPE_INTR, NULL,
osc->osc_com.sc_dev.dv_xname, "intr");
}

12
sys/arch/sparc/dev/ebus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ebus.c,v 1.9 2002/10/02 16:02:14 thorpej Exp $ */
/* $NetBSD: ebus.c,v 1.10 2002/12/10 13:44:49 pk Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@ -110,8 +110,8 @@ int ebus_print(void *, const char *);
static paddr_t ebus_bus_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int);
static int _ebus_bus_map(bus_space_tag_t, bus_addr_t,
bus_size_t, int, vaddr_t, bus_space_handle_t *);
static void *ebus_intr_establish(bus_space_tag_t, int, int, int,
int (*)(void *), void *);
static void *ebus_intr_establish(bus_space_tag_t, int, int,
int (*)(void *), void *, void (*)(void));
static bus_space_tag_t ebus_alloc_bus_tag(struct ebus_softc *);
static bus_dma_tag_t ebus_alloc_dma_tag(struct ebus_softc *, bus_dma_tag_t);
@ -532,13 +532,13 @@ ebus_bus_mmap(t, ba, off, prot, flags)
* Install an interrupt handler for a EBus device.
*/
void *
ebus_intr_establish(t, pri, level, flags, handler, arg)
ebus_intr_establish(t, pri, level, handler, arg, fastvec)
bus_space_tag_t t;
int pri;
int level;
int flags;
int (*handler)(void *);
void *arg;
void (*fastvec)(void); /* ignored */
{
return (bus_intr_establish(t->parent, pri, level, flags, handler, arg));
return (bus_intr_establish(t->parent, pri, level, handler, arg));
}

4
sys/arch/sparc/dev/esp_obio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: esp_obio.c,v 1.14 2002/10/02 16:02:14 thorpej Exp $ */
/* $NetBSD: esp_obio.c,v 1.15 2002/12/10 13:44:49 pk Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -252,7 +252,7 @@ espattach_obio(parent, self, aux)
}
/* Establish interrupt channel */
bus_intr_establish(esc->sc_bustag, oba->oba_pri, IPL_BIO, 0,
bus_intr_establish(esc->sc_bustag, oba->oba_pri, IPL_BIO,
ncr53c9x_intr, sc);
/* register interrupt stats */

5
sys/arch/sparc/dev/fd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fd.c,v 1.98 2002/12/10 12:11:21 pk Exp $ */
/* $NetBSD: fd.c,v 1.99 2002/12/10 13:44:49 pk Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -620,7 +620,7 @@ fdcattach(fdc, pri)
}
fdciop = &fdc->sc_io;
if (bus_intr_establish2(fdc->sc_bustag, pri, 0, 0,
if (bus_intr_establish2(fdc->sc_bustag, pri, 0,
fdc_c_hwintr, fdc, fdchwintr) == NULL) {
printf("\n%s: cannot register interrupt handler\n",
fdc->sc_dev.dv_xname);
@ -1363,7 +1363,6 @@ fdcswintr(arg)
void *arg;
{
struct fdc_softc *fdc = arg;
int s;
if (fdc->sc_istatus == FDC_ISTATUS_NONE)
/* This (software) interrupt is not for us */

4
sys/arch/sparc/dev/if_ie_obio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ie_obio.c,v 1.27 2002/10/02 16:02:15 thorpej Exp $ */
/* $NetBSD: if_ie_obio.c,v 1.28 2002/12/10 13:44:50 pk Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -423,6 +423,6 @@ extern void myetheraddr(u_char *); /* should be elsewhere */
/* Establish interrupt channel */
ih = bus_intr_establish(oba->oba_bustag,
oba->oba_pri, IPL_NET, 0,
oba->oba_pri, IPL_NET,
i82586_intr, sc);
}

4
sys/arch/sparc/dev/if_le_obio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le_obio.c,v 1.16 2002/10/02 16:02:15 thorpej Exp $ */
/* $NetBSD: if_le_obio.c,v 1.17 2002/12/10 13:44:50 pk Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -232,6 +232,6 @@ leattach_obio(parent, self, aux)
am7990_config(&lesc->sc_am7990);
/* Install interrupt */
(void)bus_intr_establish(lesc->sc_bustag, oba->oba_pri, IPL_NET, 0,
(void)bus_intr_establish(lesc->sc_bustag, oba->oba_pri, IPL_NET,
am7990_intr, sc);
}

4
sys/arch/sparc/dev/pckbc_js.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pckbc_js.c,v 1.6 2002/10/03 16:22:46 uwe Exp $ */
/* $NetBSD: pckbc_js.c,v 1.7 2002/12/10 13:44:50 pk Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
@ -256,7 +256,7 @@ pckbc_js_intr_establish(sc, slot)
}
res = bus_intr_establish(sc->id->t_iot, jsc->jsc_intr,
IPL_TTY, 0, pckbcintr, sc);
IPL_TTY, pckbcintr, sc);
if (res == NULL)
printf("%s: unable to establish %s slot interrupt\n",
sc->sc_dv.dv_xname, pckbc_slot_names[slot]);

6
sys/arch/sparc/dev/sbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sbus.c,v 1.54 2002/12/10 12:16:25 pk Exp $ */
/* $NetBSD: sbus.c,v 1.55 2002/12/10 13:44:50 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -109,7 +109,6 @@ static void *sbus_intr_establish __P((
bus_space_tag_t,
int, /*Sbus interrupt level*/
int, /*`device class' priority*/
int,
int (*) __P((void *)), /*handler*/
void *, /*handler arg*/
void (*) __P((void)))); /*fast handler*/
@ -663,11 +662,10 @@ sbus_get_intr(sc, node, ipp, np)
* Install an interrupt handler for an Sbus device.
*/
void *
sbus_intr_establish(t, pri, level, flags, handler, arg, fastvec)
sbus_intr_establish(t, pri, level, handler, arg, fastvec)
bus_space_tag_t t;
int pri;
int level;
int flags;
int (*handler) __P((void *));
void *arg;
void (*fastvec) __P((void));

4
sys/arch/sparc/dev/sw.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sw.c,v 1.10 2002/10/02 16:02:16 thorpej Exp $ */
/* $NetBSD: sw.c,v 1.11 2002/12/10 13:44:50 pk Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -291,7 +291,7 @@ sw_attach(parent, self, aux)
if (oba->oba_pri == -1)
oba->oba_pri = 3;
(void)bus_intr_establish(oba->oba_bustag, oba->oba_pri, IPL_BIO, 0,
(void)bus_intr_establish(oba->oba_bustag, oba->oba_pri, IPL_BIO,
sw_intr, sc);
printf(" pri %d\n", oba->oba_pri);

6
sys/arch/sparc/dev/tctrl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tctrl.c,v 1.21 2002/11/26 19:50:29 christos Exp $ */
/* $NetBSD: tctrl.c,v 1.22 2002/12/10 13:44:50 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -220,9 +220,9 @@ tctrl_attach(parent, self, aux)
if (sa->sa_nintr != 0) {
(void)bus_intr_establish(sc->sc_memt, sa->sa_pri, IPL_NONE,
0, tctrl_intr, sc);
tctrl_intr, sc);
evcnt_attach_dynamic(&sc->sc_intrcnt, EVCNT_TYPE_INTR, NULL,
sc->sc_dev.dv_xname, "intr");
sc->sc_dev.dv_xname, "intr");
}
/* See what the external status is

4
sys/arch/sparc/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.93 2002/12/09 16:11:51 pk Exp $ */
/* $NetBSD: zs.c,v 1.94 2002/12/10 13:44:50 pk Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -516,7 +516,7 @@ zs_attach(zsc, zsd, pri)
if (!didintr) {
didintr = 1;
prevpri = pri;
bus_intr_establish(zsc->zsc_bustag, pri, IPL_SERIAL, 0,
bus_intr_establish(zsc->zsc_bustag, pri, IPL_SERIAL,
zshard, NULL);
} else if (pri != prevpri)
panic("broken zs interrupt scheme");

15
sys/arch/sparc/include/bus.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus.h,v 1.34 2002/12/10 12:16:27 pk Exp $ */
/* $NetBSD: bus.h,v 1.35 2002/12/10 13:44:50 pk Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@ -140,7 +140,6 @@ struct sparc_bus_space_tag {
int, /*bus-specific intr*/
int, /*device class level,
see machine/intr.h*/
int, /*flags*/
int (*) __P((void *)), /*handler*/
void *, /*handler arg*/
void (*)(void))); /*optional fast vector*/
@ -209,7 +208,6 @@ static void *bus_intr_establish __P((
int, /*bus-specific intr*/
int, /*device class level,
see machine/intr.h*/
int, /*flags*/
int (*) __P((void *)), /*handler*/
void *)); /*handler arg*/
static void *bus_intr_establish2 __P((
@ -217,7 +215,6 @@ static void *bus_intr_establish2 __P((
int, /*bus-specific intr*/
int, /*device class level,
see machine/intr.h*/
int, /*flags*/
int (*) __P((void *)), /*handler*/
void *, /*handler arg*/
void (*)(void))); /*optional fast vector*/
@ -284,28 +281,26 @@ bus_space_mmap(t, a, o, p, f)
}
static __inline__ void *
bus_intr_establish(t, p, l, f, h, a)
bus_intr_establish(t, p, l, h, a)
bus_space_tag_t t;
int p;
int l;
int f;
int (*h)__P((void *));
void *a;
{
_BS_CALL(t, sparc_intr_establish)(t, p, l, f, h, a, NULL);
_BS_CALL(t, sparc_intr_establish)(t, p, l, h, a, NULL);
}
static __inline__ void *
bus_intr_establish2(t, p, l, f, h, a, v)
bus_intr_establish2(t, p, l, h, a, v)
bus_space_tag_t t;
int p;
int l;
int f;
int (*h)__P((void *));
void *a;
void (*v)__P((void));
{
_BS_CALL(t, sparc_intr_establish)(t, p, l, f, h, a, v);
_BS_CALL(t, sparc_intr_establish)(t, p, l, h, a, v);
}
static __inline__ void

6
sys/arch/sparc/sparc/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.207 2002/12/10 12:16:27 pk Exp $ */
/* $NetBSD: machdep.c,v 1.208 2002/12/10 13:44:50 pk Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -1781,7 +1781,6 @@ static int sparc_bus_subregion __P((bus_space_tag_t, bus_space_handle_t,
static paddr_t sparc_bus_mmap __P((bus_space_tag_t, bus_addr_t, off_t,
int, int));
static void *sparc_mainbus_intr_establish __P((bus_space_tag_t, int, int,
int,
int (*) __P((void *)),
void *,
void (*) __P((void)) ));
@ -1955,11 +1954,10 @@ bus_space_probe(tag, paddr, size, offset, flags, callback, arg)
void *
sparc_mainbus_intr_establish(t, pil, level, flags, handler, arg, fastvec)
sparc_mainbus_intr_establish(t, pil, level, handler, arg, fastvec)
bus_space_tag_t t;
int pil;
int level;
int flags;
int (*handler)__P((void *));
void *arg;
void (*fastvec)__P((void));

14
sys/arch/sparc/sparc/msiiep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: msiiep.c,v 1.14 2002/10/02 16:02:11 thorpej Exp $ */
/* $NetBSD: msiiep.c,v 1.15 2002/12/10 13:44:51 pk Exp $ */
/*
* Copyright (c) 2001 Valeriy E. Ushakov
@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.14 2002/10/02 16:02:11 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.15 2002/12/10 13:44:51 pk Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@ -144,8 +144,8 @@ static void mspcic_pci_map_print(struct mspcic_pci_map *, const char *);
static int mspcic_bus_map(bus_space_tag_t, bus_addr_t, bus_size_t,
int, vaddr_t, bus_space_handle_t *);
static paddr_t mspcic_bus_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int);
static void *mspcic_intr_establish(bus_space_tag_t, int, int, int,
int (*)(void *), void *);
static void *mspcic_intr_establish(bus_space_tag_t, int, int,
int (*)(void *), void *, void (*)(void));
static struct sparc_bus_space_tag mspcic_io_tag = {
&mspcic_io_cookie, /* cookie */
@ -585,13 +585,13 @@ mspcic_bus_mmap(t, ba, off, prot, flags)
* assignment select registers (but we use existing assignments).
*/
static void *
mspcic_intr_establish(t, line, ipl, flags, handler, arg)
mspcic_intr_establish(t, line, ipl, handler, arg, fastvec)
bus_space_tag_t t;
int line;
int ipl;
int flags;
int (*handler)(void *);
void *arg;
void (*fastvec)(void);
{
struct intrhand *ih;
int pil;
@ -608,7 +608,7 @@ mspcic_intr_establish(t, line, ipl, flags, handler, arg)
ih->ih_fun = handler;
ih->ih_arg = arg;
intr_establish(pil, ih);
intr_establish(pil, ipl, ih, fastvec);
return(ih);
}

4
sys/arch/sparc/sparc/pci_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_machdep.c,v 1.5 2002/05/16 01:33:53 uwe Exp $ */
/* $NetBSD: pci_machdep.c,v 1.6 2002/12/10 13:44:51 pk Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@ -445,7 +445,7 @@ pci_intr_establish(pc, ih, level, func, arg)
DPRINTF(SPDB_INTR,
("pci_intr_establish(line %d, ipl %d)\n", ih, level));
cookie = bus_intr_establish(sc->sc_memt, ih, level, 0, func, arg);
cookie = bus_intr_establish(sc->sc_memt, ih, level, func, arg);
/*
* TODO: to implement pci_intr_disestablish we need to capture

4
sys/arch/sparc64/dev/com_ebus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_ebus.c,v 1.17 2002/10/02 16:02:18 thorpej Exp $ */
/* $NetBSD: com_ebus.c,v 1.18 2002/12/10 13:44:51 pk Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@ -139,7 +139,7 @@ com_ebus_attach(parent, self, aux)
for (i = 0; i < ea->ea_nintr; i++)
bus_intr_establish(ea->ea_bustag, ea->ea_intr[i],
IPL_SERIAL, 0, comintr, sc);
IPL_SERIAL, comintr, sc);
kma.kmta_consdev = NULL;

9
sys/arch/sparc64/dev/ebus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ebus.c,v 1.35 2002/12/10 12:24:05 pk Exp $ */
/* $NetBSD: ebus.c,v 1.36 2002/12/10 13:44:51 pk Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Matthew R. Green
@ -116,7 +116,7 @@ int ebus_find_node __P((struct pci_attach_args *));
static paddr_t ebus_bus_mmap __P((bus_space_tag_t, bus_addr_t, off_t, int, int));
static int _ebus_bus_map __P((bus_space_tag_t, bus_addr_t, bus_size_t, int,
vaddr_t, bus_space_handle_t *));
static void *ebus_intr_establish __P((bus_space_tag_t, int, int, int,
static void *ebus_intr_establish __P((bus_space_tag_t, int, int,
int (*) __P((void *)), void *, void(*)__P((void))));
int
@ -503,15 +503,14 @@ ebus_bus_mmap(t, paddr, off, prot, flags)
* install an interrupt handler for a ebus device
*/
void *
ebus_intr_establish(t, pri, level, flags, handler, arg, fastvec)
ebus_intr_establish(t, pri, level, handler, arg, fastvec)
bus_space_tag_t t;
int pri;
int level;
int flags;
int (*handler) __P((void *));
void *arg;
void (*fastvec) __P((void)); /* ignored */
{
return (bus_intr_establish(t->parent, pri, level, flags, handler, arg));
return (bus_intr_establish(t->parent, pri, level, handler, arg));
}

4
sys/arch/sparc64/dev/lpt_ebus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lpt_ebus.c,v 1.16 2002/10/02 16:02:18 thorpej Exp $ */
/* $NetBSD: lpt_ebus.c,v 1.17 2002/12/10 13:44:51 pk Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@ -102,7 +102,7 @@ lpt_ebus_attach(parent, self, aux)
for (i = 0; i < ea->ea_nintr; i++)
bus_intr_establish(ea->ea_bustag, ea->ea_intr[i],
IPL_SERIAL, 0, lptintr, sc);
IPL_SERIAL, lptintr, sc);
printf("\n");
lpt_attach_subr(sc);

4
sys/arch/sparc64/dev/pci_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_machdep.c,v 1.33 2002/09/28 20:23:53 martin Exp $ */
/* $NetBSD: pci_machdep.c,v 1.34 2002/12/10 13:44:51 pk Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@ -477,7 +477,7 @@ pci_intr_establish(pc, ih, level, func, arg)
struct psycho_pbm *pp = (struct psycho_pbm *)pc->cookie;
DPRINTF(SPDB_INTR, ("pci_intr_establish: ih %lu; level %d", (u_long)ih, level));
cookie = bus_intr_establish(pp->pp_memt, ih, level, 0, func, arg);
cookie = bus_intr_establish(pp->pp_memt, ih, level, func, arg);
DPRINTF(SPDB_INTR, ("; returning handle %p\n", cookie));
return (cookie);

7
sys/arch/sparc64/dev/psycho.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: psycho.c,v 1.56 2002/12/10 12:24:05 pk Exp $ */
/* $NetBSD: psycho.c,v 1.57 2002/12/10 13:44:51 pk Exp $ */
/*
* Copyright (c) 2001, 2002 Eduardo E. Horvath
@ -98,7 +98,7 @@ static paddr_t psycho_bus_mmap __P((bus_space_tag_t, bus_addr_t, off_t,
int, int));
static int _psycho_bus_map __P((bus_space_tag_t, bus_addr_t, bus_size_t, int,
vaddr_t, bus_space_handle_t *));
static void *psycho_intr_establish __P((bus_space_tag_t, int, int, int,
static void *psycho_intr_establish __P((bus_space_tag_t, int, int,
int (*) __P((void *)), void *, void(*)__P((void))));
static int psycho_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *,
@ -998,11 +998,10 @@ psycho_bus_mmap(t, paddr, off, prot, flags)
* install an interrupt handler for a PCI device
*/
void *
psycho_intr_establish(t, ihandle, level, flags, handler, arg, fastvec)
psycho_intr_establish(t, ihandle, level, handler, arg, fastvec)
bus_space_tag_t t;
int ihandle;
int level;
int flags;
int (*handler) __P((void *));
void *arg;
void (*fastvec) __P((void)); /* ignored */

4
sys/arch/sparc64/dev/sab.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sab.c,v 1.7 2002/10/23 09:12:15 jdolecek Exp $ */
/* $NetBSD: sab.c,v 1.8 2002/12/10 13:44:51 pk Exp $ */
/* $OpenBSD: sab.c,v 1.7 2002/04/08 17:49:42 jason Exp $ */
/*
@ -246,7 +246,7 @@ sab_attach(parent, self, aux)
}
sc->sc_ih = bus_intr_establish(ea->ea_bustag, ea->ea_intr[0],
IPL_TTY, 0, sab_intr, sc);
IPL_TTY, sab_intr, sc);
if (sc->sc_ih == NULL) {
printf(": can't map interrupt\n");
return;

6
sys/arch/sparc64/dev/sbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sbus.c,v 1.56 2002/12/10 12:24:05 pk Exp $ */
/* $NetBSD: sbus.c,v 1.57 2002/12/10 13:44:52 pk Exp $ */
/*
* Copyright (c) 1999-2002 Eduardo Horvath
@ -83,7 +83,6 @@ static void *sbus_intr_establish __P((
bus_space_tag_t,
int, /*Sbus interrupt level*/
int, /*`device class' priority*/
int, /*flags*/
int (*) __P((void *)), /*handler*/
void *, /*handler arg*/
void (*) __P((void)))); /*optional fast trap*/
@ -604,11 +603,10 @@ sbus_get_intr(sc, node, ipp, np, slot)
* Install an interrupt handler for an Sbus device.
*/
void *
sbus_intr_establish(t, pri, level, flags, handler, arg, fastvec)
sbus_intr_establish(t, pri, level, handler, arg, fastvec)
bus_space_tag_t t;
int pri;
int level;
int flags;
int (*handler) __P((void *));
void *arg;
void (*fastvec) __P((void)); /* ignored */

4
sys/arch/sparc64/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.43 2002/10/02 16:02:20 thorpej Exp $ */
/* $NetBSD: zs.c,v 1.44 2002/12/10 13:44:52 pk Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -399,7 +399,7 @@ zs_attach(zsc, zsd, pri)
* to the interrupt handlers aren't used. Note, we only do this
* once since both SCCs interrupt at the same level and vector.
*/
bus_intr_establish(zsc->zsc_bustag, pri, IPL_SERIAL, 0, zshard, zsc);
bus_intr_establish(zsc->zsc_bustag, pri, IPL_SERIAL, zshard, zsc);
if (!(zsc->zsc_softintr = softintr_establish(softpri, zssoft, zsc)))
panic("zsattach: could not establish soft interrupt");

10
sys/arch/sparc64/include/bus.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus.h,v 1.40 2002/12/10 12:24:06 pk Exp $ */
/* $NetBSD: bus.h,v 1.41 2002/12/10 13:44:52 pk Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@ -161,7 +161,7 @@ struct sparc_bus_space_tag {
paddr_t (*sparc_bus_mmap) __P((bus_space_tag_t, bus_addr_t, off_t,
int, int));
void *(*sparc_intr_establish) __P((bus_space_tag_t, int, int, int,
void *(*sparc_intr_establish) __P((bus_space_tag_t, int, int,
int (*) __P((void *)), void *, void (*)__P((void))));
};
@ -233,7 +233,6 @@ static void *bus_intr_establish __P((
int, /*bus-specific intr*/
int, /*device class level,
see machine/intr.h*/
int, /*flags*/
int (*) __P((void *)), /*handler*/
void *)); /*handler arg*/
@ -311,15 +310,14 @@ bus_space_mmap(t, a, o, p, f)
}
__inline__ void *
bus_intr_establish(t, p, l, f, h, a)
bus_intr_establish(t, p, l, h, a)
bus_space_tag_t t;
int p;
int l;
int f;
int (*h)__P((void *));
void *a;
{
_BS_CALL(t, sparc_intr_establish)(t, p, l, f, h, a, NULL);
_BS_CALL(t, sparc_intr_establish)(t, p, l, h, a, NULL);
}
/* XXXX Things get complicated if we use unmapped register accesses. */

7
sys/arch/sparc64/sparc64/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.135 2002/12/10 12:24:07 pk Exp $ */
/* $NetBSD: machdep.c,v 1.136 2002/12/10 13:44:52 pk Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -1805,7 +1805,7 @@ static int sparc_bus_subregion __P((bus_space_tag_t, bus_space_handle_t,
bus_space_handle_t *));
static paddr_t sparc_bus_mmap __P((bus_space_tag_t, bus_addr_t, off_t, int, int));
static void *sparc_mainbus_intr_establish __P((bus_space_tag_t, int, int,
int, int (*) __P((void *)),
int (*) __P((void *)),
void *, void (*)__P((void))));
static int sparc_bus_alloc __P((bus_space_tag_t, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_size_t, int,
@ -1973,11 +1973,10 @@ sparc_bus_mmap(t, paddr, off, prot, flags)
void *
sparc_mainbus_intr_establish(t, pil, level, flags, handler, arg, fastvec)
sparc_mainbus_intr_establish(t, pil, level, handler, arg, fastvec)
bus_space_tag_t t;
int pil;
int level;
int flags;
int (*handler)__P((void *));
void *arg;
void (*fastvec)__P((void)); /* ignored */

4
sys/dev/ebus/cs4231_ebus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cs4231_ebus.c,v 1.9 2002/10/02 16:33:44 thorpej Exp $ */
/* $NetBSD: cs4231_ebus.c,v 1.10 2002/12/10 13:44:49 pk Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
@ -198,7 +198,7 @@ cs4231_ebus_attach(parent, self, aux)
/* establish interrupt channels */
for (i = 0; i < ea->ea_nintr; ++i)
bus_intr_establish(ea->ea_bustag,
ea->ea_intr[i], IPL_AUDIO, 0,
ea->ea_intr[i], IPL_AUDIO,
cs4231_ebus_intr, ebsc);
cs4231_common_attach(sc, bh);

6
sys/dev/sbus/be.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: be.c,v 1.37 2002/10/02 16:52:32 thorpej Exp $ */
/* $NetBSD: be.c,v 1.38 2002/12/10 13:44:47 pk Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.37 2002/10/02 16:52:32 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.38 2002/12/10 13:44:47 pk Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@ -309,7 +309,7 @@ beattach(parent, self, aux)
/* Establish interrupt handler */
if (sa->sa_nintr)
(void)bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_NET,
0, beintr, sc);
beintr, sc);
myetheraddr(sc->sc_enaddr);
printf(" address %s\n", ether_sprintf(sc->sc_enaddr));

6
sys/dev/sbus/bpp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bpp.c,v 1.18 2002/11/26 18:49:46 christos Exp $ */
/* $NetBSD: bpp.c,v 1.19 2002/12/10 13:44:47 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.18 2002/11/26 18:49:46 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.19 2002/12/10 13:44:47 pk Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@ -204,7 +204,7 @@ bppattach(parent, self, aux)
if (sa->sa_nintr) {
sc->sc_intrchain = bppintr;
sc->sc_intrchainarg = dsc;
(void)bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_TTY, 0,
(void)bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_TTY,
bppintr, sc);
}

6
sys/dev/sbus/cs4231_sbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cs4231_sbus.c,v 1.24 2002/10/02 16:52:34 thorpej Exp $ */
/* $NetBSD: cs4231_sbus.c,v 1.25 2002/12/10 13:44:47 pk Exp $ */
/*-
* Copyright (c) 1998, 1999, 2002 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.24 2002/10/02 16:52:34 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.25 2002/12/10 13:44:47 pk Exp $");
#include "audio.h"
#if NAUDIO > 0
@ -192,7 +192,7 @@ cs4231_sbus_attach(parent, self, aux)
/* Establish interrupt channel */
if (sa->sa_nintr)
bus_intr_establish(sa->sa_bustag,
sa->sa_pri, IPL_AUDIO, 0,
sa->sa_pri, IPL_AUDIO,
cs4231_sbus_intr, sbsc);
audio_attach_mi(&audiocs_sbus_hw_if, sbsc, &sc->sc_ad1848.sc_dev);

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

@ -1,4 +1,4 @@
/* $NetBSD: dma_sbus.c,v 1.17 2002/12/10 12:21:02 pk Exp $ */
/* $NetBSD: dma_sbus.c,v 1.18 2002/12/10 13:44:47 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.17 2002/12/10 12:21:02 pk Exp $");
__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.18 2002/12/10 13:44:47 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -105,7 +105,6 @@ void *dmabus_intr_establish __P((
bus_space_tag_t,
int, /*bus interrupt priority*/
int, /*`device class' level*/
int, /*flags*/
int (*) __P((void *)), /*handler*/
void *, /*handler arg*/
void (*) __P((void)))); /*optional fast trap handler*/
@ -236,11 +235,10 @@ dmaattach_sbus(parent, self, aux)
}
void *
dmabus_intr_establish(t, pri, level, flags, handler, arg, fastvec)
dmabus_intr_establish(t, pri, level, handler, arg, fastvec)
bus_space_tag_t t;
int pri;
int level;
int flags;
int (*handler) __P((void *));
void *arg;
void (*fastvec) __P((void)); /* ignored */
@ -254,7 +252,7 @@ dmabus_intr_establish(t, pri, level, flags, handler, arg, fastvec)
handler = lsi64854_enet_intr;
arg = sc;
}
return (bus_intr_establish(sc->sc_bustag, pri, level, flags,
return (bus_intr_establish(sc->sc_bustag, pri, level,
handler, arg));
}

6
sys/dev/sbus/esp_sbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: esp_sbus.c,v 1.26 2002/10/02 16:52:36 thorpej Exp $ */
/* $NetBSD: esp_sbus.c,v 1.27 2002/12/10 13:44:47 pk Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.26 2002/10/02 16:52:36 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.27 2002/12/10 13:44:47 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -522,7 +522,7 @@ espattach(esc, gluep)
}
/* Establish interrupt channel */
icookie = bus_intr_establish(esc->sc_bustag, esc->sc_pri, IPL_BIO, 0,
icookie = bus_intr_establish(esc->sc_bustag, esc->sc_pri, IPL_BIO,
ncr53c9x_intr, sc);
/* register interrupt stats */

6
sys/dev/sbus/if_en.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_en.c,v 1.17 2002/10/02 16:52:37 thorpej Exp $ */
/* $NetBSD: if_en.c,v 1.18 2002/12/10 13:44:47 pk Exp $ */
/*
*
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.17 2002/10/02 16:52:37 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.18 2002/12/10 13:44:47 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -143,7 +143,7 @@ en_sbus_attach(parent, self, aux)
/* Establish interrupt handler */
if (sa->sa_nintr != 0)
(void)bus_intr_establish(sa->sa_bustag, sa->sa_pri,
IPL_NET, 0, en_intr, sc);
IPL_NET, en_intr, sc);
sc->ipl = sa->sa_pri; /* appropriate? */

6
sys/dev/sbus/if_hme_sbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_hme_sbus.c,v 1.16 2002/10/02 16:52:37 thorpej Exp $ */
/* $NetBSD: if_hme_sbus.c,v 1.17 2002/12/10 13:44:47 pk Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.16 2002/10/02 16:52:37 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.17 2002/12/10 13:44:47 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -200,6 +200,6 @@ hmeattach_sbus(parent, self, aux)
/* Establish interrupt handler */
if (sa->sa_nintr != 0)
(void)bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_NET, 0,
(void)bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_NET,
hme_intr, sc);
}

6
sys/dev/sbus/if_le.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le.c,v 1.26 2002/10/02 16:52:38 thorpej Exp $ */
/* $NetBSD: if_le.c,v 1.27 2002/12/10 13:44:48 pk Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.26 2002/10/02 16:52:38 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.27 2002/12/10 13:44:48 pk Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@ -291,5 +291,5 @@ leattach_sbus(parent, self, aux)
/* Establish interrupt handler */
if (sa->sa_nintr != 0)
(void)bus_intr_establish(lesc->sc_bustag, sa->sa_pri,
IPL_NET, 0, am7990_intr, sc);
IPL_NET, am7990_intr, sc);
}

6
sys/dev/sbus/if_le_lebuffer.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le_lebuffer.c,v 1.15 2002/10/02 16:52:38 thorpej Exp $ */
/* $NetBSD: if_le_lebuffer.c,v 1.16 2002/12/10 13:44:48 pk Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.15 2002/10/02 16:52:38 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.16 2002/12/10 13:44:48 pk Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@ -222,5 +222,5 @@ leattach_lebuffer(parent, self, aux)
/* Establish interrupt handler */
if (sa->sa_nintr != 0)
(void)bus_intr_establish(lesc->sc_bustag, sa->sa_pri,
IPL_NET, 0, am7990_intr, sc);
IPL_NET, am7990_intr, sc);
}

6
sys/dev/sbus/if_le_ledma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le_ledma.c,v 1.21 2002/10/02 16:52:39 thorpej Exp $ */
/* $NetBSD: if_le_ledma.c,v 1.22 2002/12/10 13:44:48 pk Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.21 2002/10/02 16:52:39 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.22 2002/12/10 13:44:48 pk Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@ -442,7 +442,7 @@ leattach_ledma(parent, self, aux)
/* Establish interrupt handler */
if (sa->sa_nintr != 0)
(void)bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_NET, 0,
(void)bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_NET,
am7990_intr, sc);
am7990_config(&lesc->sc_am7990);

6
sys/dev/sbus/isp_sbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isp_sbus.c,v 1.58 2002/10/02 16:52:39 thorpej Exp $ */
/* $NetBSD: isp_sbus.c,v 1.59 2002/12/10 13:44:48 pk Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.58 2002/10/02 16:52:39 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.59 2002/12/10 13:44:48 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -240,7 +240,7 @@ isp_sbus_attach(struct device *parent, struct device *self, void *aux)
sbc->sbus_poff[DMA_BLOCK >> _BLK_REG_SHFT] = DMA_REGS_OFF;
/* Establish interrupt channel */
bus_intr_establish(sbc->sbus_bustag, sbc->sbus_pri, IPL_BIO, 0,
bus_intr_establish(sbc->sbus_bustag, sbc->sbus_pri, IPL_BIO,
isp_sbus_intr, sbc);
sbus_establish(&sbc->sbus_sd, &sbc->sbus_isp.isp_osinfo._dev);

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

@ -1,4 +1,4 @@
/* $NetBSD: magma.c,v 1.22 2002/12/10 12:17:35 pk Exp $ */
/* $NetBSD: magma.c,v 1.23 2002/12/10 13:44:48 pk Exp $ */
/*
* magma.c
*
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.22 2002/12/10 12:17:35 pk Exp $");
__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.23 2002/12/10 13:44:48 pk Exp $");
#if 0
#define MAGMA_DEBUG
@ -488,7 +488,7 @@ magma_attach(parent, self, aux)
return; /* No interrupts to service!? */
(void)bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_TTY,
0, magma_hard, sc);
magma_hard, sc);
sc->ms_sicookie = softintr_establish(IPL_SOFTSERIAL, magma_soft, sc);
if (sc->ms_sicookie == NULL) {
printf("\n%s: cannot establish soft int handler\n",

6
sys/dev/sbus/qe.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: qe.c,v 1.28 2002/10/02 16:52:42 thorpej Exp $ */
/* $NetBSD: qe.c,v 1.29 2002/12/10 13:44:48 pk Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.28 2002/10/02 16:52:42 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.29 2002/12/10 13:44:48 pk Exp $");
#define QEDEBUG
@ -257,7 +257,7 @@ qeattach(parent, self, aux)
qestop(sc);
/* Note: no interrupt level passed */
(void)bus_intr_establish(sa->sa_bustag, 0, IPL_NET, 0, qeintr, sc);
(void)bus_intr_establish(sa->sa_bustag, 0, IPL_NET, qeintr, sc);
myetheraddr(sc->sc_enaddr);
/*

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

@ -1,4 +1,4 @@
/* $NetBSD: qec.c,v 1.25 2002/12/10 12:21:03 pk Exp $ */
/* $NetBSD: qec.c,v 1.26 2002/12/10 13:44:48 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.25 2002/12/10 12:21:03 pk Exp $");
__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.26 2002/12/10 13:44:48 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -70,7 +70,6 @@ static void *qec_intr_establish __P((
bus_space_tag_t,
int, /*bus interrupt priority*/
int, /*`device class' interrupt level*/
int, /*flags*/
int (*) __P((void *)), /*handler*/
void *, /*arg*/
void (*) __P((void)))); /*optional fast trap handler*/
@ -260,11 +259,10 @@ qec_bus_map(t, baddr, size, flags, va, hp)
}
void *
qec_intr_establish(t, pri, level, flags, handler, arg, fastvec)
qec_intr_establish(t, pri, level, handler, arg, fastvec)
bus_space_tag_t t;
int pri;
int level;
int flags;
int (*handler) __P((void *));
void *arg;
void (*fastvec) __P((void)); /* ignored */
@ -284,7 +282,7 @@ qec_intr_establish(t, pri, level, flags, handler, arg, fastvec)
pri = sc->sc_intr->oi_pri;
}
return (bus_intr_establish(t->parent, pri, level, flags, handler, arg));
return (bus_intr_establish(t->parent, pri, level, handler, arg));
}
void

6
sys/dev/sbus/sio16.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sio16.c,v 1.10 2002/10/02 16:52:43 thorpej Exp $ */
/* $NetBSD: sio16.c,v 1.11 2002/12/10 13:44:48 pk Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.10 2002/10/02 16:52:43 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.11 2002/12/10 13:44:48 pk Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -217,7 +217,7 @@ sio16_attach(parent, self, aux)
sbus_establish(&sc->sc_sd, &sc->sc_dev);
/* establish interrupt channel */
(void)bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_TTY, 0,
(void)bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_TTY,
cd18xx_hardintr, sc);
/* reset the board, and turn on interrupts and I/O */

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

@ -1,4 +1,4 @@
/* $NetBSD: stp4020.c,v 1.28 2002/10/10 22:23:16 martin Exp $ */
/* $NetBSD: stp4020.c,v 1.29 2002/12/10 13:44:48 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.28 2002/10/10 22:23:16 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.29 2002/12/10 13:44:48 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -358,7 +358,7 @@ stp4020attach(parent, self, aux)
if (sa->sa_nintr > sbus_intno) {
bus_intr_establish(sa->sa_bustag,
sa->sa_intr[sbus_intno].oi_pri,
IPL_NONE, 0, stp4020_intr, sc);
IPL_NONE, stp4020_intr, sc);
}
rev = stp4020_rd_sockctl(&sc->sc_socks[0], STP4020_ISR1_IDX) &

6
sys/dev/sbus/zx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zx.c,v 1.5 2002/10/02 16:52:46 thorpej Exp $ */
/* $NetBSD: zx.c,v 1.6 2002/12/10 13:44:48 pk Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.5 2002/10/02 16:52:46 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.6 2002/12/10 13:44:48 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -244,7 +244,7 @@ zx_attach(struct device *parent, struct device *self, void *args)
sbus_establish(&sc->sc_sd, &sc->sc_dv);
if (sa->sa_nintr != 0)
bus_intr_establish(bt, sa->sa_pri, IPL_NONE, 0, zx_intr, sc);
bus_intr_establish(bt, sa->sa_pri, IPL_NONE, zx_intr, sc);
sc->sc_cmap = malloc(768, M_DEVBUF, M_NOWAIT);
fb_attach(&sc->sc_fb, isconsole);