diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2001-08-08 21:01:14 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2001-08-08 21:01:14 +0000 |
commit | 39ce9246791af0055ef0ec94cf71d4d722108ff1 (patch) | |
tree | fccdbf59b7e3036b397029bf728549167da5b77f /sys/arch/mvme68k/dev | |
parent | 1cb889e80dbef97f48b4969feec35ecea8df5d2f (diff) |
New timeouts.
Diffstat (limited to 'sys/arch/mvme68k/dev')
-rw-r--r-- | sys/arch/mvme68k/dev/if_ie.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/arch/mvme68k/dev/if_ie.c b/sys/arch/mvme68k/dev/if_ie.c index 4f74ffb0358..8dcd3dc76ba 100644 --- a/sys/arch/mvme68k/dev/if_ie.c +++ b/sys/arch/mvme68k/dev/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.14 2001/06/10 14:54:42 miod Exp $ */ +/* $OpenBSD: if_ie.c,v 1.15 2001/08/08 21:01:05 miod Exp $ */ /*- * Copyright (c) 1999 Steve Murphree, Jr. @@ -1423,7 +1423,10 @@ command_and_wait(sc, cmd, pcmd, mask) volatile struct ie_cmd_common *cc = pcmd; volatile struct ie_sys_ctl_block *scb = sc->scb; volatile int timedout = 0; +#if 0 + struct timeout chan_tmo; extern int hz; +#endif scb->ie_command = (u_short)cmd; @@ -1442,7 +1445,8 @@ command_and_wait(sc, cmd, pcmd, mask) * According to the packet driver, the minimum timeout should * be .369 seconds, which we round up to .4. */ - timeout(chan_attn_timeout, (caddr_t)&timedout, 2 * hz / 5); + timeout_set(&chan_tmo, chan_attn_timeout, (caddr_t)&timedout); + timeout_add(&chan_tmo, 2 * hz / 5); #endif /* @@ -1456,7 +1460,7 @@ command_and_wait(sc, cmd, pcmd, mask) if ((cc->ie_cmd_status & mask) || timedout) break; #if 0 - untimeout(chan_attn_timeout, (caddr_t)&timedout); + timeout_del(&chan_tmo); #endif return timedout; |