d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch up with new interrupt handling code.

Browse Source
This commit is contained in:
Ruslan Ermilov 2005-10-26 06:44:59 +00:00
parent e110f39bf3
commit c9003bc7fa
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/cx/if_cx.c
View File

@ -2547,7 +2547,7 @@ static int cx_modevent (module_t mod, int type, void *unused)
callout_init (&timeout_handle, cx_mpsafenet?CALLOUT_MPSAFE:0);
callout_reset (&timeout_handle, hz*5, cx_timeout, 0);
/* Software interrupt. */
swi_add(&tty_ithd, "cx", cx_softintr, NULL, SWI_TTY,
swi_add(&tty_intr_event, "cx", cx_softintr, NULL, SWI_TTY,
(cx_mpsafenet?INTR_MPSAFE:0), &cx_fast_ih);
break;
case MOD_UNLOAD:
@ -2560,7 +2560,7 @@ static int cx_modevent (module_t mod, int type, void *unused)
/* If we were wait it than it reasserted now, just stop it. */
if (!callout_drain (&timeout_handle))
callout_stop (&timeout_handle);
ithread_remove_handler (cx_fast_ih);
intr_event_remove_handler (cx_fast_ih);
--load_count;
break;
case MOD_SHUTDOWN:

4
sys/dev/cy/cy.c
View File

@ -428,9 +428,9 @@ cyattach_common(cy_addr cy_iobase, int cy_align)
splx(s);
if (cy_fast_ih == NULL) {
swi_add(&tty_ithd, "cy", cypoll, NULL, SWI_TTY, 0,
swi_add(&tty_intr_event, "cy", cypoll, NULL, SWI_TTY, 0,
&cy_fast_ih);
swi_add(&clk_ithd, "cy", cypoll, NULL, SWI_CLOCK, 0,
swi_add(&clk_intr_event, "cy", cypoll, NULL, SWI_CLOCK, 0,
&cy_slow_ih);
}
ttycreate(tp, TS_CALLOUT, "c%r%r",

4
sys/dev/rc/rc.c
View File

@ -311,7 +311,7 @@ rc_attach(device_t dev)
goto fail;
}
swi_add(&tty_ithd, "tty:rc", rc_pollcard, sc, SWI_TTY, 0,
swi_add(&tty_intr_event, "tty:rc", rc_pollcard, sc, SWI_TTY, 0,
&sc->sc_swicookie);
return (0);
@ -336,7 +336,7 @@ rc_detach(device_t dev)
error = bus_teardown_intr(dev, sc->sc_irq, sc->sc_hwicookie);
if (error)
device_printf(dev, "failed to deregister interrupt handler\n");
ithread_remove_handler(sc->sc_swicookie);
intr_event_remove_handler(sc->sc_swicookie);
rc_release_resources(dev);
return (0);

2
sys/dev/sab/sab.c
View File

@ -321,7 +321,7 @@ sab_attach(device_t dev)
for (i = 0; i < SAB_NCHAN; i++)
sc->sc_child[i] = device_get_softc(child[i]);
swi_add(&tty_ithd, "tty:sab", sab_softintr, sc, SWI_TTY,
swi_add(&tty_intr_event, "tty:sab", sab_softintr, sc, SWI_TTY,
INTR_TYPE_TTY, &sc->sc_softih);
if (sabtty_cons != NULL) {

4
sys/pc98/cbus/sio.c
View File

@ -1718,9 +1718,9 @@ determined_type: ;
printf("\n");
if (sio_fast_ih == NULL) {
swi_add(&tty_ithd, "sio", siopoll, NULL, SWI_TTY, 0,
swi_add(&tty_intr_event, "sio", siopoll, NULL, SWI_TTY, 0,
&sio_fast_ih);
swi_add(&clk_ithd, "sio", siopoll, NULL, SWI_CLOCK, 0,
swi_add(&clk_intr_event, "sio", siopoll, NULL, SWI_CLOCK, 0,
&sio_slow_ih);
}