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

The `fast trap' handlers are now pssed as an optional argument to

Browse Source 
bus_intr_establish(). Allow fall-back on a regular interrupt handler if
the interrupt level must be shared with another device.
This commit is contained in:
pk 2002-12-10 12:11:21 +00:00
parent 4f62e0f7c8
commit fe233fdc10
2 changed files with 23 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: audioamd.c,v 1.14 2002/12/09 16:11:50 pk Exp $ */ /* $NetBSD: audioamd.c,v 1.15 2002/12/10 12:11:22 pk Exp $ */
/* NetBSD: am7930_sparc.c,v 1.44 1999/03/14 22:29:00 jonathan Exp */ /* NetBSD: am7930_sparc.c,v 1.44 1999/03/14 22:29:00 jonathan Exp */
/* /*
@ -62,12 +62,13 @@
/* interrupt interfaces */ /* interrupt interfaces */
#ifdef AUDIO_C_HANDLER
int am7930hwintr __P((void *)); int am7930hwintr __P((void *));
#endif /* AUDIO_C_HANDLER */
struct auio *auiop; struct auio *auiop;
void am7930swintr __P((void *)); void am7930swintr __P((void *));
/* from amd7930intr.s: */
void amd7930_trap(void);
/* /*
* interrupt-handler status * interrupt-handler status
*/ */
@ -304,14 +305,12 @@ audioamd_attach(sc, pri)
am7930_init(&sc->sc_am7930, AUDIOAMD_POLL_MODE); am7930_init(&sc->sc_am7930, AUDIOAMD_POLL_MODE);
auiop = &sc->sc_au; auiop = &sc->sc_au;
#ifndef AUDIO_C_HANDLER
(void)bus_intr_establish(sc->sc_bt, pri, IPL_AUDIO, /* Copy bus tag & handle for use by am7930_trap */
BUS_INTR_ESTABLISH_FASTTRAP, sc->sc_au.au_bt = sc->sc_bt;
(int (*) __P((void *)))amd7930_trap, NULL); sc->sc_au.au_bh = sc->sc_bh;
#else (void)bus_intr_establish2(sc->sc_bt, pri, IPL_AUDIO, 0,
(void)bus_intr_establish(sc->sc_bt, pri, IPL_AUDIO, 0, am7930hwintr, sc, amd7930_trap);
am7930hwintr, sc);
#endif
sc->sc_sicookie = softintr_establish(IPL_SOFTAUDIO, am7930swintr, sc); sc->sc_sicookie = softintr_establish(IPL_SOFTAUDIO, am7930swintr, sc);
if (sc->sc_sicookie == NULL) { if (sc->sc_sicookie == NULL) {
@ -376,10 +375,6 @@ audioamd_start_output(addr, p, cc, intr, arg)
} }
sc->sc_pintr = intr; sc->sc_pintr = intr;
sc->sc_parg = arg; sc->sc_parg = arg;
#ifndef AUDIO_C_HANDLER
sc->sc_au.au_bt = sc->sc_bt;
sc->sc_au.au_bh = sc->sc_bh;
#endif
sc->sc_au.au_pdata = p; sc->sc_au.au_pdata = p;
sc->sc_au.au_pend = (char *)p + cc - 1; sc->sc_au.au_pend = (char *)p + cc - 1;
return(0); return(0);
@ -405,10 +400,6 @@ audioamd_start_input(addr, p, cc, intr, arg)
} }
sc->sc_rintr = intr; sc->sc_rintr = intr;
sc->sc_rarg = arg; sc->sc_rarg = arg;
#ifndef AUDIO_C_HANDLER
sc->sc_au.au_bt = sc->sc_bt;
sc->sc_au.au_bh = sc->sc_bh;
#endif
sc->sc_au.au_rdata = p; sc->sc_au.au_rdata = p;
sc->sc_au.au_rend = (char *)p + cc -1; sc->sc_au.au_rend = (char *)p + cc -1;
return(0); return(0);
@ -419,7 +410,6 @@ audioamd_start_input(addr, p, cc, intr, arg)
* Pseudo-DMA support: either C or locore assember. * Pseudo-DMA support: either C or locore assember.
*/ */
#ifdef AUDIO_C_HANDLER
int int
am7930hwintr(v) am7930hwintr(v)
void *v; void *v;
@ -462,7 +452,6 @@ am7930hwintr(v)
au->au_intrcnt.ev_count++; au->au_intrcnt.ev_count++;
return (1); return (1);
} }
#endif /* AUDIO_C_HANDLER */
void void
am7930swintr(sc0) am7930swintr(sc0)

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

@ -1,4 +1,4 @@
/* $NetBSD: fd.c,v 1.97 2002/12/09 16:11:50 pk Exp $ */ /* $NetBSD: fd.c,v 1.98 2002/12/10 12:11:21 pk Exp $ */
/*- /*-
* Copyright (c) 2000 The NetBSD Foundation, Inc. * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -620,21 +620,14 @@ fdcattach(fdc, pri)
} }
fdciop = &fdc->sc_io; fdciop = &fdc->sc_io;
if (bus_intr_establish(fdc->sc_bustag, pri, IPL_BIO, if (bus_intr_establish2(fdc->sc_bustag, pri, 0, 0,
BUS_INTR_ESTABLISH_FASTTRAP, fdc_c_hwintr, fdc, fdchwintr) == NULL) {
(int (*) __P((void *)))fdchwintr, NULL) == NULL) { printf("\n%s: cannot register interrupt handler\n",
printf("%s: notice: no fast trap handler slot available\n",
fdc->sc_dev.dv_xname); fdc->sc_dev.dv_xname);
if (bus_intr_establish(fdc->sc_bustag, pri, IPL_BIO, 0, return (-1);
fdc_c_hwintr, fdc) == NULL) {
printf("%s: cannot register interrupt handler\n",
fdc->sc_dev.dv_xname);
return (-1);
}
} }
fdc->sc_sicookie = softintr_establish(IPL_SOFTFDC, fdcswintr, fdc); fdc->sc_sicookie = softintr_establish(IPL_BIO, fdcswintr, fdc);
if (fdc->sc_sicookie == NULL) { if (fdc->sc_sicookie == NULL) {
printf("\n%s: cannot register soft interrupt handler\n", printf("\n%s: cannot register soft interrupt handler\n",
fdc->sc_dev.dv_xname); fdc->sc_dev.dv_xname);
@ -1305,6 +1298,13 @@ fdc_c_hwintr(arg)
fdc->sc_istatus = FDC_ISTATUS_DONE; fdc->sc_istatus = FDC_ISTATUS_DONE;
softintr_schedule(fdc->sc_sicookie); softintr_schedule(fdc->sc_sicookie);
return (1); return (1);
case FDC_ITASK_RESULT:
if (fdcresult(fdc) == -1)
fdc->sc_istatus = FDC_ISTATUS_ERROR;
else
fdc->sc_istatus = FDC_ISTATUS_DONE;
softintr_schedule(fdc->sc_sicookie);
return (1);
case FDC_ITASK_DMA: case FDC_ITASK_DMA:
/* Proceed with pseudo-dma below */ /* Proceed with pseudo-dma below */
break; break;
@ -1378,9 +1378,7 @@ fdcswintr(arg)
break; break;
} }
s = splbio();
fdcstate(fdc); fdcstate(fdc);
splx(s);
return; return;
} }