diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-01-29 07:17:01 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-01-29 07:17:01 +0000 |
| commit | dfb60e365033ae3066e264598ca67089d14f542f (patch) | |
| tree | f864d95cf2471766a0ec7ebfea4ee30d0ce1bcf1 /sys | |
| parent | 0f7a8828201d693fbd8bc55b66e421b3e72745ad (diff) | |
new timeouts
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/isa/bt.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/isa/bt.c b/sys/dev/isa/bt.c index 8bf31d4a04c..fa964e8736e 100644 --- a/sys/dev/isa/bt.c +++ b/sys/dev/isa/bt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt.c,v 1.23 1999/01/07 06:14:47 niklas Exp $ */ +/* $OpenBSD: bt.c,v 1.24 2001/01/29 07:17:00 mickey Exp $ */ /* $NetBSD: bt.c,v 1.10 1996/05/12 23:51:54 mycroft Exp $ */ #undef BTDIAG @@ -454,7 +454,7 @@ AGAIN: goto next; } - untimeout(bt_timeout, ccb); + timeout_del(&ccb->xs->stimeout); bt_done(sc, ccb); next: @@ -718,8 +718,10 @@ bt_start_ccbs(sc) /* Tell the card to poll immediately. */ outb(iobase + BT_CMD_PORT, BT_START_SCSI); - if ((ccb->xs->flags & SCSI_POLL) == 0) - timeout(bt_timeout, ccb, (ccb->timeout * hz) / 1000); + if ((ccb->xs->flags & SCSI_POLL) == 0) { + timeout_set(&ccb->xs->stimeout, bt_timeout, ccb); + timeout_add(&ccb->xs->stimeout, (ccb->timeout * hz) / 1000); + } ++sc->sc_mbofull; bt_nextmbx(wmbo, wmbx, mbo); |