diff options
author | bde <bde@FreeBSD.org> | 1997-04-20 15:36:12 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1997-04-20 15:36:12 +0000 |
commit | 7963d92bf141d4bdfc3b096a7d4692b58713290b (patch) | |
tree | 1ecd30e2210d317a9285526dd6e444875789dde6 /sys/i386/isa/si.c | |
parent | e34af1091c2a425d01698055f7065e5e0d61abec (diff) | |
download | FreeBSD-src-7963d92bf141d4bdfc3b096a7d4692b58713290b.zip FreeBSD-src-7963d92bf141d4bdfc3b096a7d4692b58713290b.tar.gz |
Fixed the type of timeout functions and removed casts that hid the
type mismatches. There was no problem in practice (at least on 386's).
Diffstat (limited to 'sys/i386/isa/si.c')
-rw-r--r-- | sys/i386/isa/si.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c index 5d8429b..cb2c452 100644 --- a/sys/i386/isa/si.c +++ b/sys/i386/isa/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.56 1997/03/23 03:35:01 bde Exp $ + * $Id: si.c,v 1.57 1997/03/24 12:02:48 bde Exp $ */ #ifndef lint @@ -98,7 +98,7 @@ static int si_modem __P((struct si_port *, enum si_mctl, int)); static void si_write_enable __P((struct si_port *, int)); static int si_Sioctl __P((dev_t, int, caddr_t, int, struct proc *)); static void si_start __P((struct tty *)); -static void si_lstart __P((struct si_port *)); +static timeout_t si_lstart; static void si_disc_optim __P((struct tty *tp, struct termios *t, struct si_port *pp)); static void sihardclose __P((struct si_port *pp)); @@ -914,7 +914,7 @@ siclose(dev, flag, mode, p) /* ok. we are now still on the right track.. nuke the hardware */ if (pp->sp_state & SS_LSTART) { - untimeout((timeout_func_t)si_lstart, (caddr_t)pp); + untimeout(si_lstart, (caddr_t)pp); pp->sp_state &= ~SS_LSTART; } @@ -2118,12 +2118,12 @@ si_start(tp) } if ((pp->sp_state & (SS_LSTART|SS_INLSTART)) == SS_LSTART) { - untimeout((timeout_func_t)si_lstart, (caddr_t)pp); + untimeout(si_lstart, (caddr_t)pp); } else { pp->sp_state |= SS_LSTART; } DPRINT((pp, DBG_START, "arming lstart, time=%d\n", time)); - timeout((timeout_func_t)si_lstart, (caddr_t)pp, time); + timeout(si_lstart, (caddr_t)pp, time); } out: @@ -2138,9 +2138,9 @@ out: * time for protocols like ppp. */ static void -si_lstart(pp) - register struct si_port *pp; +si_lstart(void *arg) { + register struct si_port *pp = arg; register struct tty *tp; int oldspl; |