diff options
| author | jhb <jhb@FreeBSD.org> | 2001-02-09 18:35:53 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2001-02-09 18:35:53 +0000 |
| commit | af4d30125622a5368efed6aa030567a2b40ef253 (patch) | |
| tree | c9a751fb93b816861a4fec2d226bcd34e1496ad4 /sys | |
| parent | 5026efeb4d50f69b56d58ef8baa01adc1e13baa3 (diff) | |
| download | FreeBSD-src-af4d30125622a5368efed6aa030567a2b40ef253.zip FreeBSD-src-af4d30125622a5368efed6aa030567a2b40ef253.tar.gz | |
Catch up to the new swi API.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/rc/rc.c | 13 | ||||
| -rw-r--r-- | sys/i386/isa/rc.c | 13 |
2 files changed, 12 insertions, 14 deletions
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c index 2b55c52..a7e5ecb 100644 --- a/sys/dev/rc/rc.c +++ b/sys/dev/rc/rc.c @@ -172,7 +172,7 @@ static int rc_rcsrt[16] = { TTY_BI|TTY_PE|TTY_FE|TTY_OE }; -static struct intrhand *rc_ih; +static void *rc_ih; /* Static prototypes */ static ointhand2_t rcintr; @@ -270,8 +270,7 @@ rcattach(dvp) rcb->rcb_probed = RC_ATTACHED; if (!rc_started) { cdevsw_add(&rc_cdevsw); - rc_ih = sinthand_add("tty:rc", &tty_ithd, rcpoll, NULL, - SWI_TTY, 0); + swi_add(&tty_ithd, "tty:rc", rcpoll, NULL, SWI_TTY, 0, &rc_ih); rc_wakeup((void *)NULL); rc_started = 1; } @@ -365,7 +364,7 @@ rcintr(unit) optr++; rc_scheduled_event++; if (val != 0 && val == rc->rc_hotchar) - sched_swi(rc_ih, SWI_NOSWITCH); + swi_sched(rc_ih, SWI_NOSWITCH); } } else { /* Store also status data */ @@ -396,7 +395,7 @@ rcintr(unit) && (rc->rc_tp->t_iflag & INPCK)))) val = 0; else if (val != 0 && val == rc->rc_hotchar) - sched_swi(rc_ih, SWI_NOSWITCH); + swi_sched(rc_ih, SWI_NOSWITCH); optr[0] = val; optr[INPUT_FLAGS_SHIFT] = iack; optr++; @@ -443,7 +442,7 @@ rcintr(unit) if ((iack & MCR_CDchg) && !(rc->rc_flags & RC_MODCHG)) { rc_scheduled_event += LOTS_OF_EVENTS; rc->rc_flags |= RC_MODCHG; - sched_swi(rc_ih, SWI_NOSWITCH); + swi_sched(rc_ih, SWI_NOSWITCH); } goto more_intrs; } @@ -484,7 +483,7 @@ rcintr(unit) if (!(rc->rc_flags & RC_DOXXFER)) { rc_scheduled_event += LOTS_OF_EVENTS; rc->rc_flags |= RC_DOXXFER; - sched_swi(rc_ih, SWI_NOSWITCH); + swi_sched(rc_ih, SWI_NOSWITCH); } } } diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c index 2b55c52..a7e5ecb 100644 --- a/sys/i386/isa/rc.c +++ b/sys/i386/isa/rc.c @@ -172,7 +172,7 @@ static int rc_rcsrt[16] = { TTY_BI|TTY_PE|TTY_FE|TTY_OE }; -static struct intrhand *rc_ih; +static void *rc_ih; /* Static prototypes */ static ointhand2_t rcintr; @@ -270,8 +270,7 @@ rcattach(dvp) rcb->rcb_probed = RC_ATTACHED; if (!rc_started) { cdevsw_add(&rc_cdevsw); - rc_ih = sinthand_add("tty:rc", &tty_ithd, rcpoll, NULL, - SWI_TTY, 0); + swi_add(&tty_ithd, "tty:rc", rcpoll, NULL, SWI_TTY, 0, &rc_ih); rc_wakeup((void *)NULL); rc_started = 1; } @@ -365,7 +364,7 @@ rcintr(unit) optr++; rc_scheduled_event++; if (val != 0 && val == rc->rc_hotchar) - sched_swi(rc_ih, SWI_NOSWITCH); + swi_sched(rc_ih, SWI_NOSWITCH); } } else { /* Store also status data */ @@ -396,7 +395,7 @@ rcintr(unit) && (rc->rc_tp->t_iflag & INPCK)))) val = 0; else if (val != 0 && val == rc->rc_hotchar) - sched_swi(rc_ih, SWI_NOSWITCH); + swi_sched(rc_ih, SWI_NOSWITCH); optr[0] = val; optr[INPUT_FLAGS_SHIFT] = iack; optr++; @@ -443,7 +442,7 @@ rcintr(unit) if ((iack & MCR_CDchg) && !(rc->rc_flags & RC_MODCHG)) { rc_scheduled_event += LOTS_OF_EVENTS; rc->rc_flags |= RC_MODCHG; - sched_swi(rc_ih, SWI_NOSWITCH); + swi_sched(rc_ih, SWI_NOSWITCH); } goto more_intrs; } @@ -484,7 +483,7 @@ rcintr(unit) if (!(rc->rc_flags & RC_DOXXFER)) { rc_scheduled_event += LOTS_OF_EVENTS; rc->rc_flags |= RC_DOXXFER; - sched_swi(rc_ih, SWI_NOSWITCH); + swi_sched(rc_ih, SWI_NOSWITCH); } } } |
