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:

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 3dd7b60..c080a2a 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -19,7 +19,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id: wt.c,v 1.8 1994/08/13 03:50:20 wollman Exp $
+ * $Id: wt.c,v 1.9 1994/08/20 03:48:43 davidg Exp $
  *
  */
 
@@ -156,7 +156,7 @@ static int wtwait (wtinfo_t *t, int catch, char *msg);
 static int wtcmd (wtinfo_t *t, int cmd);
 static int wtstart (wtinfo_t *t, unsigned mode, void *vaddr, unsigned len);
 static void wtdma (wtinfo_t *t);
-static void wtimer (caddr_t);
+static timeout_t wtimer;
 static void wtclock (wtinfo_t *t);
 static int wtreset (wtinfo_t *t);
 static int wtsense (wtinfo_t *t, int verb, int ignor);
@@ -770,7 +770,7 @@ static void wtclock (wtinfo_t *t)
 		t->flags |= TPTIMER;
 		/* Some controllers seem to lose dma interrupts too often.
 		 * To make the tape stream we need 1 tick timeout. */
-		timeout ((timeout_func_t)wtimer, (caddr_t)t, (t->flags & TPACTIVE) ? 1 : hz);
+		timeout (wtimer, (caddr_t)t, (t->flags & TPACTIVE) ? 1 : hz);
 	}
 }
 
@@ -779,7 +779,7 @@ static void wtclock (wtinfo_t *t)
  * This is necessary in case interrupts get eaten due to
  * multiple devices on a single IRQ line.
  */
-static void wtimer (caddr_t xt)
+static void wtimer (void *xt)
 {
 	wtinfo_t *t = (wtinfo_t *)xt;
 	int s;