From da8ef4a889c82e5b52739babfa512b3a4f1d7bfa Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Sat, 18 Sep 2004 19:08:08 +0000 Subject: [PATCH] timeout/untimeout ==> callout_* --- sys/dev/misc/labpc/labpc.c | 10 +++++----- sys/dev/misc/mse/mse.c | 13 ++++++------- sys/dev/misc/psm/psm.c | 16 +++++++--------- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/sys/dev/misc/labpc/labpc.c b/sys/dev/misc/labpc/labpc.c index 367b80ccd5..06fc985ee6 100644 --- a/sys/dev/misc/labpc/labpc.c +++ b/sys/dev/misc/labpc/labpc.c @@ -39,7 +39,7 @@ * dufault@hda.com * * $FreeBSD: src/sys/i386/isa/labpc.c,v 1.35 1999/09/25 18:24:08 phk Exp $ - * $DragonFly: src/sys/dev/misc/labpc/labpc.c,v 1.8 2004/05/19 22:52:43 dillon Exp $ + * $DragonFly: src/sys/dev/misc/labpc/labpc.c,v 1.9 2004/09/18 19:08:06 dillon Exp $ * */ @@ -146,7 +146,7 @@ struct ctlr /* * Handle for canceling our timeout. */ - struct callout_handle ch; + struct callout ch; /* Device configuration structure: */ @@ -334,7 +334,7 @@ done_and_start_next(struct ctlr *ctlr, struct buf *bp, int err) ctlr->start_queue.b_actf = bp->b_actf; bp_done(bp, err); - untimeout(tmo_stop, ctlr, ctlr->ch); + callout_stop(&ctlr->ch); start(ctlr); } @@ -480,7 +480,7 @@ labpcattach(struct isa_device *dev) struct ctlr *ctlr = labpcs[dev->id_unit]; dev->id_ointr = labpcintr; - callout_handle_init(&ctlr->ch); + callout_init(&ctlr->ch); ctlr->sample_us = (1000000.0 / (double)LABPC_DEFAULT_HERZ) + .50; reset(ctlr); @@ -810,7 +810,7 @@ start(struct ctlr *ctlr) (*ctlr->intr)(ctlr); } - ctlr->ch = timeout(tmo_stop, ctlr, ctlr->tmo); + callout_reset(&ctlr->ch, ctlr->tmo, tmo_stop, ctlr); } static void diff --git a/sys/dev/misc/mse/mse.c b/sys/dev/misc/mse/mse.c index 9cdd9f70ae..84d2bf5bb8 100644 --- a/sys/dev/misc/mse/mse.c +++ b/sys/dev/misc/mse/mse.c @@ -12,7 +12,7 @@ * without express or implied warranty. * * $FreeBSD: src/sys/i386/isa/mse.c,v 1.49.2.1 2000/03/20 13:58:47 yokota Exp $ - * $DragonFly: src/sys/dev/misc/mse/mse.c,v 1.9 2004/05/19 22:52:43 dillon Exp $ + * $DragonFly: src/sys/dev/misc/mse/mse.c,v 1.10 2004/09/18 19:08:07 dillon Exp $ */ /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and @@ -93,7 +93,7 @@ typedef struct mse_softc { int sc_buttons; int sc_bytesread; u_char sc_bytes[MOUSE_SYS_PACKETSIZE]; - struct callout_handle sc_callout; + struct callout sc_callout; int sc_watchdog; mousehw_t hw; mousemode_t mode; @@ -358,7 +358,7 @@ mse_attach(dev) flags = device_get_flags(dev); sc->mode.accelfactor = (flags & MSE_CONFIG_ACCEL) >> 4; - callout_handle_init(&sc->sc_callout); + callout_init(&sc->sc_callout); cdevsw_add(&mse_cdevsw, ~1, unit << 1); make_dev(&mse_cdevsw, unit << 1, 0, 0, 0600, "mse%d", unit); @@ -412,7 +412,7 @@ mseopen(dev, flags, fmt, td) sc->sc_deltax = sc->sc_deltay = 0; sc->sc_bytesread = sc->mode.packetsize = MOUSE_MSC_PACKETSIZE; sc->sc_watchdog = FALSE; - sc->sc_callout = timeout(msetimeout, dev, hz*2); + callout_reset(&sc->sc_callout, hz * 2, msetimeout, dev); sc->mode.level = 0; sc->status.flags = 0; sc->status.button = sc->status.obutton = 0; @@ -440,8 +440,7 @@ mseclose(dev, flags, fmt, td) mse_softc_t *sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev)); int s; - untimeout(msetimeout, dev, sc->sc_callout); - callout_handle_init(&sc->sc_callout); + callout_stop(&sc->sc_callout); s = spltty(); (*sc->sc_disablemouse)(sc->sc_iot, sc->sc_ioh); sc->sc_flags &= ~MSESC_OPEN; @@ -683,7 +682,7 @@ msetimeout(arg) mseintr(sc); } sc->sc_watchdog = TRUE; - sc->sc_callout = timeout(msetimeout, dev, hz); + callout_reset(&sc->sc_callout, hz, msetimeout, dev); } /* diff --git a/sys/dev/misc/psm/psm.c b/sys/dev/misc/psm/psm.c index b13b439ccf..4e42f4cbb3 100644 --- a/sys/dev/misc/psm/psm.c +++ b/sys/dev/misc/psm/psm.c @@ -21,7 +21,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/isa/psm.c,v 1.23.2.7 2003/11/12 04:26:26 mikeh Exp $ - * $DragonFly: src/sys/dev/misc/psm/psm.c,v 1.12 2004/07/02 18:59:01 eirikn Exp $ + * $DragonFly: src/sys/dev/misc/psm/psm.c,v 1.13 2004/09/18 19:08:08 dillon Exp $ */ /* @@ -172,7 +172,7 @@ struct psm_softc { /* Driver status information */ int syncerrors; struct timeval inputtimeout; int watchdog; /* watchdog timer flag */ - struct callout_handle callout; /* watchdog timer call out */ + struct callout callout; /* watchdog timer call out */ }; devclass_t psm_devclass; #define PSM_SOFTC(unit) ((struct psm_softc*)devclass_get_softc(psm_devclass, unit)) @@ -796,7 +796,7 @@ doopen(struct psm_softc *sc, int command_byte) /* start the watchdog timer */ sc->watchdog = FALSE; - sc->callout = timeout(psmtimeout, (void *)(uintptr_t)sc, hz*2); + callout_reset(&sc->callout, hz * 2, psmtimeout, (void *)(uintptr_t)sc); return (0); } @@ -815,8 +815,7 @@ reinitialize(struct psm_softc *sc, int doinit) /* block our watchdog timer */ sc->watchdog = FALSE; - untimeout(psmtimeout, (void *)(uintptr_t)sc, sc->callout); - callout_handle_init(&sc->callout); + callout_stop(&sc->callout); /* save the current controller command byte */ empty_both_buffers(sc->kbdc, 10); @@ -1235,7 +1234,7 @@ psmattach(device_t dev) /* Setup initial state */ sc->state = PSM_VALID; - callout_handle_init(&sc->callout); + callout_init(&sc->callout); /* Setup our interrupt handler */ rid = 0; @@ -1420,8 +1419,7 @@ psmclose(dev_t dev, int flag, int fmt, struct thread *td) splx(s); /* stop the watchdog timer */ - untimeout(psmtimeout, (void *)(uintptr_t)sc, sc->callout); - callout_handle_init(&sc->callout); + callout_stop(&sc->callout); /* remove anything left in the output buffer */ empty_aux_buffer(sc->kbdc, 10); @@ -1960,7 +1958,7 @@ psmtimeout(void *arg) } sc->watchdog = TRUE; splx(s); - sc->callout = timeout(psmtimeout, (void *)(uintptr_t)sc, hz); + callout_reset(&sc->callout, hz, psmtimeout, (void *)(uintptr_t)sc); } static void -- 2.41.0