summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorBret Lambert <blambert@cvs.openbsd.org>2010-06-30 20:39:03 +0000
committerBret Lambert <blambert@cvs.openbsd.org>2010-06-30 20:39:03 +0000
commitb300c3fb26343782f5bd6c3d25ac3077e4e3c083 (patch)
tree46f7d55b3198f33be0e1d484243d35f1cb0695b9 /sys/dev
parent9f41651cc302b19305f81c1b12632cbe3d4dd018 (diff)
timeout_add -> timeout_add_msec
ok jakemsr@, who promises to deal with any fallout, because he's a stand-up guy
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/isa/ess.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c
index 99c330ee742..fd54aa49b50 100644
--- a/sys/dev/isa/ess.c
+++ b/sys/dev/isa/ess.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ess.c,v 1.14 2008/10/25 22:30:43 jakemsr Exp $ */
+/* $OpenBSD: ess.c,v 1.15 2010/06/30 20:39:02 blambert Exp $ */
/* $NetBSD: ess.c,v 1.44.4.1 1999/06/21 01:18:00 thorpej Exp $ */
/*
@@ -1310,7 +1310,7 @@ ess_audio1_trigger_output(addr, start, end, blksize, intr, arg, param)
sc->sc_audio1.buffersize = (char *)end - (char *)start;
sc->sc_audio1.dmacount = 0;
sc->sc_audio1.blksize = blksize;
- timeout_add(&sc->sc_tmo1, hz/30);
+ timeout_add_msec(&sc->sc_tmo1, 1000/30);
}
reg = ess_read_x_reg(sc, ESS_XCMD_AUDIO_CTRL);
@@ -1388,7 +1388,7 @@ ess_audio2_trigger_output(addr, start, end, blksize, intr, arg, param)
sc->sc_audio2.buffersize = (char *)end - (char *)start;
sc->sc_audio2.dmacount = 0;
sc->sc_audio2.blksize = blksize;
- timeout_add(&sc->sc_tmo2, hz/30);
+ timeout_add_msec(&sc->sc_tmo2, 1000/30);
}
reg = ess_read_mix_reg(sc, ESS_MREG_AUDIO2_CTRL2);
@@ -1457,7 +1457,7 @@ ess_audio1_trigger_input(addr, start, end, blksize, intr, arg, param)
sc->sc_audio1.buffersize = (char *)end - (char *)start;
sc->sc_audio1.dmacount = 0;
sc->sc_audio1.blksize = blksize;
- timeout_add(&sc->sc_tmo1, hz/30);
+ timeout_add_msec(&sc->sc_tmo1, 1000/30);
}
reg = ess_read_x_reg(sc, ESS_XCMD_AUDIO_CTRL);
@@ -1627,7 +1627,7 @@ ess_audio1_poll(addr)
(*sc->sc_audio1.intr)(sc->sc_audio1.arg, dmacount);
#endif
- timeout_add(&sc->sc_tmo1, hz/30);
+ timeout_add_msec(&sc->sc_tmo1, 1000/30);
}
void
@@ -1658,7 +1658,7 @@ ess_audio2_poll(addr)
(*sc->sc_audio2.intr)(sc->sc_audio2.arg, dmacount);
#endif
- timeout_add(&sc->sc_tmo2, hz/30);
+ timeout_add_msec(&sc->sc_tmo2, 1000/30);
}
int