diff options
author | paul <paul@FreeBSD.org> | 1994-08-23 07:52:29 +0000 |
---|---|---|
committer | paul <paul@FreeBSD.org> | 1994-08-23 07:52:29 +0000 |
commit | 0263782ac99fec051f81ed6c34e3c826d2bd6314 (patch) | |
tree | 1a2f222286653b303cf48139b53eeb284f193e60 /sys/dev/sio/sio.c | |
parent | 5d3f6f3b9b41a168bfb967539740ad70d9b6af91 (diff) | |
download | FreeBSD-src-0263782ac99fec051f81ed6c34e3c826d2bd6314.zip FreeBSD-src-0263782ac99fec051f81ed6c34e3c826d2bd6314.tar.gz |
Ran ft.c through ident.
Added a missing #ifdef INET wrapper in lpt.c
Main change:
Removed the timeout_func_t casts from timeout calls and
correctly defined the timeout routines to conform to
the new format.
lpt.c doesn't have this change.
Reviewed by:
Submitted by:
Diffstat (limited to 'sys/dev/sio/sio.c')
-rw-r--r-- | sys/dev/sio/sio.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index d505c4d..509e767 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.48 1994/08/13 03:50:13 wollman Exp $ + * $Id: sio.c,v 1.49 1994/08/18 05:09:35 davidg Exp $ */ #include "sio.h" @@ -266,7 +266,7 @@ static void commctl __P((struct com_s *com, int bits, int how)); static int comparam __P((struct tty *tp, struct termios *t)); static int sioprobe __P((struct isa_device *dev)); static void comstart __P((struct tty *tp)); -static void comwakeup __P((caddr_t chan, int ticks)); +static timeout_t comwakeup; static int tiocm_xxx2mcr __P((int tiocm_xxx)); /* table and macro for fast conversion from a unit number to its com struct */ @@ -570,7 +570,7 @@ determined_type: ; com_addr(unit) = com; splx(s); if (!comwakeup_started) { - comwakeup((caddr_t) NULL, 0); + comwakeup((caddr_t) NULL); comwakeup_started = TRUE; } return (1); @@ -1724,13 +1724,12 @@ commctl(com, bits, how) } static void -comwakeup(chan, ticks) - caddr_t chan; - int ticks; +comwakeup(chan) + void *chan; { int unit; - timeout((timeout_func_t)comwakeup, (caddr_t) NULL, hz / 100); + timeout(comwakeup, (caddr_t) NULL, hz / 100); if (com_events != 0) { #ifndef OLD_INTERRUPT_HANDLING |