4 files changed, 8 insertions, 12 deletions
diff --git a/i386/i386at/com.c b/i386/i386at/com.c
index 51f3ff1..bd5b989 100644
--- a/i386/i386at/com.c
+++ b/i386/i386at/com.c
@@ -29,6 +29,7 @@
 #include <mach/std_types.h>
 #include <sys/types.h>
 #include <kern/printf.h>
+#include <kern/mach_clock.h>
 #include <sys/time.h>
 #include <device/conf.h>
 #include <device/errno.h>
@@ -45,8 +46,6 @@
 
 #include <device/cons.h>
 
-extern void timeout(), ttrstrt();
-
 int comprobe(), comstart(), commctl();
 void comstop(), comattach(), comintr();
 static void comparam();
@@ -383,7 +382,7 @@ io_return_t comopen(
 
 	if (!comtimer_active) {
 		comtimer_active = TRUE;
-		comtimer();
+		comtimer(NULL);
 	}
 
 	s = spltty();
@@ -664,7 +663,7 @@ comst_4++;
 int comtimer_interval = 5;
 
 void
-comtimer()
+comtimer(void * param)
 {
 	spl_t	s = spltty();
 	struct tty *tp = com_tty;
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index a0a36b7..6209031 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -102,8 +102,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 void kd_enqsc();			/* enqueues a scancode */
 
-void timeout();
-
 #if 0
 #define BROKEN_KEYBOARD_RESET
 #endif
@@ -380,7 +378,7 @@ feep()
 	kd_bellon();
 	for (i = 0; i < 50000; ++i)
 		;
-	kd_belloff();
+	kd_belloff(NULL);
 }
 
 void
@@ -671,7 +669,7 @@ int	flags;				/* flags set for console */
 	if (val == KD_BELLON)
 		kd_bellon();
 	else if (val == KD_BELLOFF)
-		kd_belloff();
+		kd_belloff(NULL);
 	else
 		err = D_INVALID_OPERATION;
 
@@ -1232,7 +1230,7 @@ kdinit()
 static unsigned int kd_bellstate = 0;
 
 void
-kd_belloff()
+kd_belloff(void * param)
 {
 	unsigned char status;
 
diff --git a/i386/i386at/kd.h b/i386/i386at/kd.h
index e12f039..a6036d7 100644
--- a/i386/i386at/kd.h
+++ b/i386/i386at/kd.h
@@ -720,7 +720,7 @@ extern void kd_delln (int);
 extern void kd_delch (int);
 extern void kd_erase (int);
 extern void kd_bellon (void);
-extern void kd_belloff (void);
+extern void kd_belloff (void *param);
 extern void kdinit (void);
 extern int kdsetkbent (struct kbentry *, int);
 extern int kdgetkbent (struct kbentry *);
diff --git a/i386/i386at/lpr.c b/i386/i386at/lpr.c
index 07e8414..d4f82b1 100644
--- a/i386/i386at/lpr.c
+++ b/i386/i386at/lpr.c
@@ -34,6 +34,7 @@
 #include <mach/std_types.h>
 #include <sys/types.h>
 #include <kern/printf.h>
+#include <kern/mach_clock.h>
 #include <sys/time.h>
 #include <device/conf.h>
 #include <device/errno.h>
@@ -58,8 +59,6 @@
 #include <i386at/autoconf.h>
 #include <i386at/lprreg.h>
   
-extern void 	timeout();
-extern void 	ttrstrt();
 
 /* 
  * Driver information for auto-configuration stuff.