diff options
| author | jhb <jhb@FreeBSD.org> | 2000-10-25 20:21:42 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2000-10-25 20:21:42 +0000 |
| commit | eec9a831189c595dd5b5c94d814978f6c8af3a9f (patch) | |
| tree | cc6b69e756b5d231dbdaf1b4cbc96bbc51b4fc48 /sys/pc98/cbus | |
| parent | 5d34eae65950c2cf2b87cdf02157e6cf269c5db5 (diff) | |
| download | FreeBSD-src-eec9a831189c595dd5b5c94d814978f6c8af3a9f.zip FreeBSD-src-eec9a831189c595dd5b5c94d814978f6c8af3a9f.tar.gz | |
Catch up to the new swi code.
Noticed by: phk
Diffstat (limited to 'sys/pc98/cbus')
| -rw-r--r-- | sys/pc98/cbus/clock.c | 4 | ||||
| -rw-r--r-- | sys/pc98/cbus/pcrtc.c | 4 | ||||
| -rw-r--r-- | sys/pc98/cbus/sio.c | 4 |
3 files changed, 2 insertions, 10 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c index f757a6a..421a9ec 100644 --- a/sys/pc98/cbus/clock.c +++ b/sys/pc98/cbus/clock.c @@ -241,7 +241,6 @@ clkintr(struct clockframe frame) switch (timer0_state) { case RELEASED: - setdelayed(); break; case ACQUIRED: @@ -249,7 +248,6 @@ clkintr(struct clockframe frame) >= hardclock_max_count) { timer0_prescaler_count -= hardclock_max_count; hardclock(&frame); - setdelayed(); } break; @@ -264,7 +262,6 @@ clkintr(struct clockframe frame) mtx_exit(&clock_lock, MTX_SPIN); timer_func = new_function; timer0_state = ACQUIRED; - setdelayed(); break; case RELEASE_PENDING: @@ -283,7 +280,6 @@ clkintr(struct clockframe frame) timer_func = hardclock; timer0_state = RELEASED; hardclock(&frame); - setdelayed(); } break; } diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c index f757a6a..421a9ec 100644 --- a/sys/pc98/cbus/pcrtc.c +++ b/sys/pc98/cbus/pcrtc.c @@ -241,7 +241,6 @@ clkintr(struct clockframe frame) switch (timer0_state) { case RELEASED: - setdelayed(); break; case ACQUIRED: @@ -249,7 +248,6 @@ clkintr(struct clockframe frame) >= hardclock_max_count) { timer0_prescaler_count -= hardclock_max_count; hardclock(&frame); - setdelayed(); } break; @@ -264,7 +262,6 @@ clkintr(struct clockframe frame) mtx_exit(&clock_lock, MTX_SPIN); timer_func = new_function; timer0_state = ACQUIRED; - setdelayed(); break; case RELEASE_PENDING: @@ -283,7 +280,6 @@ clkintr(struct clockframe frame) timer_func = hardclock; timer0_state = RELEASED; hardclock(&frame); - setdelayed(); } break; } diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index 4477cac..fa0320a 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -420,7 +420,7 @@ static void siointr1 __P((struct com_s *com)); static void siointr __P((void *arg)); static int commctl __P((struct com_s *com, int bits, int how)); static int comparam __P((struct tty *tp, struct termios *t)); -static swihand_t siopoll; +static void siopoll __P((void *dummy)); static int sioprobe __P((device_t dev, int xrid)); static int sio_isa_probe __P((device_t dev)); static void siosettimeout __P((void)); @@ -3354,7 +3354,7 @@ sioioctl(dev, cmd, data, flag, p) /* software interrupt handler for SWI_TTY */ static void -siopoll() +siopoll(void *dummy) { int unit; int intrsave; |
