diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2000-12-13 16:03:12 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2000-12-13 16:03:12 +0000 |
| commit | 34665b11c8f4bd54f52b12e6e6a7ff2822da25aa (patch) | |
| tree | 0794720519fd237d99c3bc837dbba734cb7e9a99 /sys | |
| parent | e092cf396887c8f66ec5060e3a99d72eed4da9f5 (diff) | |
better new timeouts
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/aac.c | 7 | ||||
| -rw-r--r-- | sys/dev/ic/gdt_common.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c index 641f75b68e4..91f4d7410fc 100644 --- a/sys/dev/ic/aac.c +++ b/sys/dev/ic/aac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aac.c,v 1.2 2000/12/13 15:32:39 mickey Exp $ */ +/* $OpenBSD: aac.c,v 1.3 2000/12/13 16:03:11 mickey Exp $ */ /*- * Copyright (c) 2000 Michael Smith @@ -1482,15 +1482,18 @@ aac_start_ccbs(sc) if (aac_exec_ccb(ccb) == 0) { ccb->ac_flags |= AAC_ACF_WATCHDOG; + timeout_set(&ccb->ac_xs->stimeout, aac_watchdog, ccb); timeout_add(&xs->stimeout, (AAC_WATCH_TIMEOUT * hz) / 1000); break; } TAILQ_REMOVE(&sc->sc_ccbq, ccb, ac_chain); - if ((xs->flags & SCSI_POLL) == 0) + if ((xs->flags & SCSI_POLL) == 0) { + timeout_set(&ccb->ac_xs->stimeout, aac_timeout, ccb); timeout_add(&xs->stimeout, (ccb->ac_timeout * hz) / 1000); + } } } diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c index 8c188cff90d..85c7ec7373f 100644 --- a/sys/dev/ic/gdt_common.c +++ b/sys/dev/ic/gdt_common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt_common.c,v 1.10 2000/12/13 15:32:39 mickey Exp $ */ +/* $OpenBSD: gdt_common.c,v 1.11 2000/12/13 16:03:11 mickey Exp $ */ /* * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -1307,15 +1307,18 @@ gdt_start_ccbs(gdt) if (gdt_exec_ccb(ccb) == 0) { ccb->gc_flags |= GDT_GCF_WATCHDOG; + timeout_set(&ccb->gc_xs->stimeout, gdt_watchdog, ccb); timeout_add(&xs->stimeout, (GDT_WATCH_TIMEOUT * hz) / 1000); break; } TAILQ_REMOVE(&gdt->sc_ccbq, ccb, gc_chain); - if ((xs->flags & SCSI_POLL) == 0) + if ((xs->flags & SCSI_POLL) == 0) { + timeout_set(&ccb->gc_xs->stimeout, gdt_timeout, ccb); timeout_add(&xs->stimeout, (ccb->gc_timeout * hz) / 1000); + } } } |