2 files changed, 22 insertions, 23 deletions

diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 518aa38b11e7..61e385f9411e 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.26 1994/05/25 08:58:39 rgrimes Exp $
+ *	$Id: fd.c,v 1.27 1994/08/13 03:49:57 wollman Exp $
  *
  */
 
@@ -199,7 +199,7 @@ int	fd_debug = 1;
 
 static void fdstart(fdcu_t);
 void fdintr(fdcu_t);
-static void fd_turnoff(caddr_t);
+static timeout_t fd_turnoff;
 
 /****************************************************************************/
 /*                      autoconfiguration stuff                             */
@@ -417,7 +417,7 @@ void fdstrategy(struct buf *bp)
 	dp = &(fdc->head);
 	s = splbio();
 	disksort(dp, bp);
-	untimeout((timeout_func_t)fd_turnoff, (caddr_t)fdu); /* a good idea */
+	untimeout(fd_turnoff, (caddr_t)fdu); /* a good idea */
 	fdstart(fdcu);
 	splx(s);
 	return;
@@ -463,7 +463,7 @@ set_motor(fdcu, fdu, reset)
 }
 
 static void
-fd_turnoff(caddr_t arg1)
+fd_turnoff(void *arg1)
 {
 	fdu_t fdu = (fdu_t)arg1;
 	int	s;
@@ -476,7 +476,7 @@ fd_turnoff(caddr_t arg1)
 }
 
 void
-fd_motor_on(caddr_t arg1)
+fd_motor_on(void *arg1)
 {
 	fdu_t fdu = (fdu_t)arg1;
 	int	s;
@@ -502,7 +502,7 @@ fd_turnon(fdu)
 	{
 		fd_turnon1(fdu);
 		fd->flags |= FD_MOTOR_WAIT;
-		timeout((timeout_func_t)fd_motor_on, (caddr_t)fdu, hz); /* in 1 sec its ok */
+		timeout(fd_motor_on, (caddr_t)fdu, hz); /* in 1 sec its ok */
 	}
 }
 
@@ -685,7 +685,7 @@ fdstart(fdcu)
 }
 
 static void
-fd_timeout(caddr_t arg1)
+fd_timeout(void *arg1)
 {
 	fdcu_t fdcu = (fdcu_t)arg1;
 	fdu_t fdu = fdc_data[fdcu].fdu;
@@ -732,7 +732,7 @@ fd_timeout(caddr_t arg1)
 
 /* just ensure it has the right spl */
 static void
-fd_pseudointr(caddr_t arg1, int arg2)
+fd_pseudointr(void *arg1)
 {
 	fdcu_t fdcu = (fdcu_t)arg1;
 	int	s;
@@ -809,8 +809,8 @@ fdstate(fdcu, fdc)
 	TRACE1("fd%d",fdu);
 	TRACE1("[%s]",fdstates[fdc->state]);
 	TRACE1("(0x%x)",fd->flags);
-	untimeout((timeout_func_t)fd_turnoff, (caddr_t)fdu);
-	timeout((timeout_func_t)fd_turnoff, (caddr_t)fdu, 4 * hz);
+	untimeout(fd_turnoff, (caddr_t)fdu);
+	timeout(fd_turnoff, (caddr_t)fdu, 4 * hz);
 	switch (fdc->state)
 	{
 	case DEVIDLE:
@@ -855,12 +855,12 @@ fdstate(fdcu, fdc)
 		out_fdc(fdcu,bp->b_cylin * fd->ft->steptrac);
 		fd->track = -2;
 		fdc->state = SEEKWAIT;
-		timeout((timeout_func_t)fd_timeout, (caddr_t)fdcu, 2 * hz);
+		timeout(fd_timeout, (caddr_t)fdcu, 2 * hz);
 		return(0);	/* will return later */
 	case SEEKWAIT:
-		untimeout((timeout_func_t)fd_timeout, (caddr_t)fdcu);
+		untimeout(fd_timeout, (caddr_t)fdcu);
 		/* allow heads to settle */
-		timeout((timeout_func_t)fd_pseudointr, (caddr_t)fdcu, hz / 50);
+		timeout(fd_pseudointr, (caddr_t)fdcu, hz / 50);
 		fdc->state = SEEKCOMPLETE;
 		return(0);	/* will return later */
 		break;
@@ -925,10 +925,10 @@ fdstate(fdcu, fdc)
 			out_fdc(fdcu,fd->ft->datalen);  /* data length */
 		}
 		fdc->state = IOCOMPLETE;
-		timeout((timeout_func_t)fd_timeout, (caddr_t)fdcu, 2 * hz);
+		timeout(fd_timeout, (caddr_t)fdcu, 2 * hz);
 		return(0);	/* will return later */
 	case IOCOMPLETE: /* IO DONE, post-analyze */
-		untimeout((timeout_func_t)fd_timeout, (caddr_t)fdcu);
+		untimeout(fd_timeout, (caddr_t)fdcu);
 		for(i=0;i<7;i++)
 		{
 			fdc->status[i] = in_fdc(fdcu);
@@ -991,7 +991,7 @@ fdstate(fdcu, fdc)
 		return(0);	/* will return later */
 	case RECALWAIT:
 		/* allow heads to settle */
-		timeout((timeout_func_t)fd_pseudointr, (caddr_t)fdcu, hz / 30);
+		timeout(fd_pseudointr, (caddr_t)fdcu, hz / 30);
 		fdc->state = RECALCOMPLETE;
 		return(0);	/* will return later */
 	case RECALCOMPLETE:
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index d505c4d47edf..509e7675be7e 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