The end of old timeouts is near...

3 files changed, 21 insertions, 10 deletions

diff --git a/sys/arch/vax/qbus/dz.c b/sys/arch/vax/qbus/dz.c
index 040747e9a6e..1beb48682de 100644
--- a/sys/arch/vax/qbus/dz.c
+++ b/sys/arch/vax/qbus/dz.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dz.c,v 1.4 2001/06/15 22:45:33 miod Exp $	*/
+/*	$OpenBSD: dz.c,v 1.5 2001/08/19 23:54:27 miod Exp $	*/
 /*	$NetBSD: dz.c,v 1.19 2000/01/24 02:40:29 matt Exp $	*/
 /*
  * Copyright (c) 1996  Ken C. Wellsch.  All rights reserved.
@@ -50,6 +50,7 @@
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
+#include <sys/timeout.h>
 
 #ifdef DDB
 #include <dev/cons.h>
@@ -126,6 +127,8 @@ cdev_decl(dz);
  */
 int	dz_timer = 0;	/* true if timer started */
 
+struct timeout dz_timeout;
+
 #define DZ_DZ	8		/* Unibus DZ-11 board linecount */
 #define DZ_DZV	4		/* Q-bus DZV-11 or DZQ-11 */
 
@@ -151,7 +154,8 @@ dzattach(sc)
 
 	if (dz_timer == 0) {
 		dz_timer = 1;
-		timeout(dzscan, (void *)0, hz);
+		timeout_set(&dz_timeout, dzscan, NULL);
+		timeout_add(&dz_timeout, hz);
 	}
 	printf("\n");
 	return;
@@ -721,6 +725,6 @@ dzscan(arg)
 		sc->sc_rxint = 0;
 	}
 	(void) splx(s);
-	timeout(dzscan, (void *)0, hz);
+	timeout_add(&dz_timeout, hz);
 	return;
 }
diff --git a/sys/arch/vax/vsa/dc.c b/sys/arch/vax/vsa/dc.c
index 0200eca52a8..660772b9701 100644
--- a/sys/arch/vax/vsa/dc.c
+++ b/sys/arch/vax/vsa/dc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dc.c,v 1.3 2000/07/19 13:53:30 art Exp $	*/
+/*	$OpenBSD: dc.c,v 1.4 2001/08/19 23:54:22 miod Exp $	*/
 /*	$NetBSD: dc.c,v 1.4 1996/10/13 03:36:10 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
@@ -75,6 +75,7 @@
 #include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
+#include <sys/timeout.h>
 
 /*
  * bertram 17-apr-1996: we could use most of the include files directly
@@ -170,6 +171,7 @@ char	dcsoftCAR[NDC];		/* mask of dc's with carrier on (DSR) */
  * we have to use a timer to watch it.
  */
 int	dc_timer;		/* true if timer started */
+struct	timeout dc_timeout;
 
 /*
  * Pdma structures for fast output code
@@ -278,7 +280,7 @@ raster_console()
 
 /*
  * DC7085 (dz-11) probe routine from old-style config.
- * This is only here out of intertia.
+ * This is only here out of inertia.
  */
 int
 dc_doprobe(addr, unit, flags, priority)
@@ -325,7 +327,8 @@ dc_doprobe(addr, unit, flags, priority)
 
 	if (dc_timer == 0) {
 		dc_timer = 1;
-		timeout(dcscan, (void *)0, hz);
+		timeout_set(&dc_timeout, dcscan, NULL);
+		timeout_add(&dc_timeout, hz);
 	}
 
 	/*
@@ -895,7 +898,7 @@ dcscan(arg)
 	    (*linesw[tp->t_line].l_modem)(tp, 0) == 0)
 		dcaddr->dc_tcr &= ~bit;
 	splx(s);
-	timeout(dcscan, (void *)0, hz);
+	timeout_add(&dc_timeout, hz);
 }
 
 /*
diff --git a/sys/arch/vax/vsa/smg.c b/sys/arch/vax/vsa/smg.c
index 29c534470a8..be9e54b95fb 100644
--- a/sys/arch/vax/vsa/smg.c
+++ b/sys/arch/vax/vsa/smg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smg.c,v 1.4 2001/06/15 22:45:34 miod Exp $	*/
+/*	$OpenBSD: smg.c,v 1.5 2001/08/19 23:54:22 miod Exp $	*/
 /*	$NetBSD: smg.c,v 1.21 2000/03/23 06:46:44 thorpej Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
@@ -38,6 +38,7 @@
 #include <sys/malloc.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
+#include <sys/timeout.h>
 
 #include <machine/vsbus.h>
 #include <machine/sid.h>
@@ -198,6 +199,8 @@ struct	smg_screen {
 static	struct smg_screen smg_conscreen;
 static	struct smg_screen *curscr;
 
+static	struct timeout smg_blink_timeout;
+
 extern int getmajor __P((void *));	/* conf.c */
 
 int
@@ -247,7 +250,8 @@ smg_attach(struct device *parent, struct device *self, void *aux)
 	aa.console = !(vax_confdata & 0x20);
 	aa.scrdata = &smg_screenlist;
 	aa.accessops = &smg_accessops;
-	timeout(smg_crsr_blink, 0, hz/2);
+	timeout_set(&smg_blink_timeout, smg_crsr_blink, NULL);
+	timeout_add(&smg_blink_timeout, hz / 2);
 	curcmd = CUR_CMD_HSHI;
 	WRITECUR(CUR_CMD, curcmd);
 	qf = qvss8x15.data;
@@ -263,7 +267,7 @@ smg_crsr_blink(void *arg)
 {
 	if (cur_on)
 		*cursor ^= 255;
-	timeout(smg_crsr_blink, 0, hz/2);
+	timeout_add(&smg_blink_timeout, hz / 2);
 }
 
 void