diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2001-08-19 15:07:35 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2001-08-19 15:07:35 +0000 |
| commit | 68af87218387ffa40a86125da9459ac9956907ea (patch) | |
| tree | 0f31dc4932428f6c7fdeecf086255e2f88976521 /sys/dev/pci/ncr.c | |
| parent | d74034f18f5e708e8409b442dd4d742d502dbe4f (diff) | |
More old timeouts removal, mainly affected unused/unmaintained code.
Diffstat (limited to 'sys/dev/pci/ncr.c')
| -rw-r--r-- | sys/dev/pci/ncr.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c index 61f7f668160..05b1574b2a2 100644 --- a/sys/dev/pci/ncr.c +++ b/sys/dev/pci/ncr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr.c,v 1.58 2001/08/12 20:03:49 mickey Exp $ */ +/* $OpenBSD: ncr.c,v 1.59 2001/08/19 15:07:34 miod Exp $ */ /* $NetBSD: ncr.c,v 1.63 1997/09/23 02:39:15 perry Exp $ */ /************************************************************************** @@ -222,6 +222,8 @@ #ifndef __OpenBSD__ #include <sys/sysctl.h> #include <machine/clock.h> +#else +#include <sys/timeout.h> #endif #include <vm/vm.h> #include <vm/vm_extern.h> @@ -1213,6 +1215,8 @@ struct ncb { u_long lasttime; #ifdef __FreeBSD__ struct callout_handle timeout_ch; +#elif defined (__OpenBSD__) + struct timeout sc_timeout; #endif /*----------------------------------------------- @@ -1463,7 +1467,7 @@ static void ncr_attach (pcici_t tag, int unit); #if 0 static char ident[] = - "\n$OpenBSD: ncr.c,v 1.58 2001/08/12 20:03:49 mickey Exp $\n"; + "\n$OpenBSD: ncr.c,v 1.59 2001/08/19 15:07:34 miod Exp $\n"; #endif static const u_long ncr_version = NCR_VERSION * 11 @@ -4261,6 +4265,7 @@ static void ncr_attach (pcici_t config_id, int unit) /* ** start the timeout daemon */ + timeout_set(&np->sc_timeout, ncr_timeout, np); ncr_timeout (np); np->lasttime=0; @@ -5866,7 +5871,7 @@ static void ncr_timeout (void *arg) #ifdef __FreeBSD__ np->timeout_ch = timeout (ncr_timeout, (caddr_t) np, step ? step : 1); #else - timeout (ncr_timeout, (caddr_t) np, step ? step : 1); + timeout_add(&np->sc_timeout, step ? step : 1); #endif if (INB(nc_istat) & (INTF|SIP|DIP)) { @@ -6237,7 +6242,7 @@ void ncr_exception (ncb_p np) #ifdef __FreeBSD__ untimeout (ncr_timeout, (caddr_t) np, np->timeout_ch); #else - untimeout (ncr_timeout, (caddr_t) np); + timeout_del(&np->sc_timeout); #endif printf ("%s: halted!\n", ncr_name(np)); |