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

change the type of the apbus interrupt handler from void to int 

for each driver to indicate the interrupt has been handled or not.
This commit is contained in:
onoe 2000-10-12 03:13:47 +00:00
parent be4c939451
commit f2c3050d29
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/newsmips/apbus/if_sn.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_sn.c,v 1.5 2000/10/01 23:32:41 thorpej Exp $ */ /* $NetBSD: if_sn.c,v 1.6 2000/10/12 03:13:47 onoe Exp $ */
/* /*
* National Semiconductor DP8393X SONIC Driver * National Semiconductor DP8393X SONIC Driver
@ -845,16 +845,18 @@ initialise_rra(sc)
wbflush(); wbflush();
} }
void int
snintr(arg) snintr(arg)
void *arg; void *arg;
{ {
struct sn_softc *sc = (struct sn_softc *)arg; struct sn_softc *sc = (struct sn_softc *)arg;
int handled = 0;
int isr; int isr;
while ((isr = (NIC_GET(sc, SNR_ISR) & ISR_ALL)) != 0) { while ((isr = (NIC_GET(sc, SNR_ISR) & ISR_ALL)) != 0) {
/* scrub the interrupts that we are going to service */ /* scrub the interrupts that we are going to service */
NIC_PUT(sc, SNR_ISR, isr); NIC_PUT(sc, SNR_ISR, isr);
handled = 1;
wbflush(); wbflush();
if (isr & (ISR_BR | ISR_LCD | ISR_TC)) if (isr & (ISR_BR | ISR_LCD | ISR_TC))
@ -903,7 +905,7 @@ snintr(arg)
} }
snstart(&sc->sc_if); snstart(&sc->sc_if);
} }
return; return handled;
} }
/* /*

7
sys/arch/newsmips/apbus/zs_ap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs_ap.c,v 1.4 2000/03/06 21:36:10 thorpej Exp $ */ /* $NetBSD: zs_ap.c,v 1.5 2000/10/12 03:13:47 onoe Exp $ */
/*- /*-
* Copyright (c) 1996 The NetBSD Foundation, Inc. * Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -138,7 +138,7 @@ static u_char zs_init_reg[16] = {
static struct zschan * zs_get_chan_addr __P((int, int)); static struct zschan * zs_get_chan_addr __P((int, int));
static void zs_ap_delay __P((void)); static void zs_ap_delay __P((void));
static void zshard_ap __P((void *)); static int zshard_ap __P((void *));
static int zs_getc __P((void *)); static int zs_getc __P((void *));
static void zs_putc __P((void *, int)); static void zs_putc __P((void *, int));
int zshard __P((void *)); int zshard __P((void *));
@ -351,11 +351,12 @@ zs_ap_attach(parent, self, aux)
* Our ZS chips all share a common, autovectored interrupt, * Our ZS chips all share a common, autovectored interrupt,
* so we have to look at all of them on each interrupt. * so we have to look at all of them on each interrupt.
*/ */
static void static int
zshard_ap(arg) zshard_ap(arg)
void *arg; void *arg;
{ {
zshard(arg); zshard(arg);
return 1;
} }
/* /*