aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/uart
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2005-10-25 19:48:48 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2005-10-25 19:48:48 +0000
commite0f66ef8615145ae7e857974912975bba3a47390 (patch)
treec0e88867c475b0bb7f3b0c1dc5799cf5ad98997f /sys/dev/uart
parenteb2893ec18d8b9150434cb3e197df0249a301bca (diff)
Notes
Diffstat (limited to 'sys/dev/uart')
-rw-r--r--sys/dev/uart/uart_kbd_sun.c2
-rw-r--r--sys/dev/uart/uart_tty.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/uart/uart_kbd_sun.c b/sys/dev/uart/uart_kbd_sun.c
index 4d024d2ea878..22e47fa474a5 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 a2219c67cb2e..5eb6eb1a8794 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);