diff options
| author | Bret Lambert <blambert@cvs.openbsd.org> | 2008-10-15 19:12:21 +0000 |
|---|---|---|
| committer | Bret Lambert <blambert@cvs.openbsd.org> | 2008-10-15 19:12:21 +0000 |
| commit | 447ea046b5b4aba425b2879f683099c1cfa3713f (patch) | |
| tree | 8bca5f4e5c63f94a107ad0f4fb69f34c526fe488 /sys/dev/isa/fd.c | |
| parent | b302a033156f300c77b20b1eb011b4ceaccff009 (diff) | |
Second pass of simple timeout_add -> timeout_add_sec conversions
This should take care of the simpler ones (i.e., timeout values of
integer multiples of hz).
ok krw@, art@
Diffstat (limited to 'sys/dev/isa/fd.c')
| -rw-r--r-- | sys/dev/isa/fd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index 528a0daf223..b5cde05df53 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.74 2008/06/12 06:58:39 deraadt Exp $ */ +/* $OpenBSD: fd.c,v 1.75 2008/10/15 19:12:18 blambert Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -496,7 +496,7 @@ fdfinish(fd, bp) biodone(bp); /* turn off motor 5s from now */ - timeout_add(&fd->fd_motor_off_to, 5 * hz); + timeout_add_sec(&fd->fd_motor_off_to, 5); fdc->sc_state = DEVIDLE; } @@ -760,7 +760,7 @@ loop: fd->sc_dk.dk_seek++; disk_busy(&fd->sc_dk); - timeout_add(&fd->fdtimeout_to, 4 * hz); + timeout_add_sec(&fd->fdtimeout_to, 4); return 1; case DOIO: @@ -827,7 +827,7 @@ loop: disk_busy(&fd->sc_dk); /* allow 2 seconds for operation */ - timeout_add(&fd->fdtimeout_to, 2 * hz); + timeout_add_sec(&fd->fdtimeout_to, 2); return 1; /* will return later */ case SEEKWAIT: @@ -918,7 +918,7 @@ loop: out_fdc(iot, ioh, NE7CMD_RECAL); /* recal function */ out_fdc(iot, ioh, fd->sc_drive); fdc->sc_state = RECALWAIT; - timeout_add(&fd->fdtimeout_to, 5 * hz); + timeout_add_sec(&fd->fdtimeout_to, 5); return 1; /* will return later */ case RECALWAIT: |