diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/sio/sio.c | 4 | ||||
| -rw-r--r-- | sys/dev/uart/uart_kbd_sun.c | 2 | ||||
| -rw-r--r-- | sys/dev/uart/uart_tty.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index ddfd9e9..6157ebb 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -1055,9 +1055,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); } diff --git a/sys/dev/uart/uart_kbd_sun.c b/sys/dev/uart/uart_kbd_sun.c index 4d024d2..22e47fa 100644 --- a/sys/dev/uart/uart_kbd_sun.c +++ b/sys/dev/uart/uart_kbd_sun.c @@ -254,7 +254,7 @@ sunkbd_attach(struct uart_softc *sc) #endif sunkbd_enable(&sunkbd_softc.sc_kbd); - swi_add(&tty_ithd, uart_driver_name, sunkbd_uart_intr, + swi_add(&tty_intr_event, uart_driver_name, sunkbd_uart_intr, &sunkbd_softc, SWI_TTY, INTR_TYPE_TTY, &sc->sc_softih); sc->sc_opened = 1; diff --git a/sys/dev/uart/uart_tty.c b/sys/dev/uart/uart_tty.c index a2219c6..5eb6eb1 100644 --- a/sys/dev/uart/uart_tty.c +++ b/sys/dev/uart/uart_tty.c @@ -377,7 +377,7 @@ uart_tty_attach(struct uart_softc *sc) ttyconsolemode(tp, 0); } - swi_add(&tty_ithd, uart_driver_name, uart_tty_intr, sc, SWI_TTY, + swi_add(&tty_intr_event, uart_driver_name, uart_tty_intr, sc, SWI_TTY, INTR_TYPE_TTY, &sc->sc_softih); ttycreate(tp, TS_CALLOUT, "u%r", unit); @@ -392,7 +392,7 @@ int uart_tty_detach(struct uart_softc *sc) tp = sc->sc_u.u_tty.tp; tp->t_pps = NULL; ttygone(tp); - ithread_remove_handler(sc->sc_softih); + intr_event_remove_handler(sc->sc_softih); ttyfree(tp); return (0); |
