From 007bf9bb74abb3c9b30299d0ee4a99f8e5189892 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Wed, 15 Sep 2004 00:41:53 +0000 Subject: [PATCH] timeout/untimeout ==> callout_* --- sys/dev/netif/sbni/if_sbni.c | 11 +++++------ sys/dev/netif/sbni/if_sbnivar.h | 4 ++-- sys/dev/netif/sf/if_sf.c | 13 ++++++------- sys/dev/netif/sf/if_sfreg.h | 4 ++-- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/sys/dev/netif/sbni/if_sbni.c b/sys/dev/netif/sbni/if_sbni.c index bd3f6c86ab..e12f3ab892 100644 --- a/sys/dev/netif/sbni/if_sbni.c +++ b/sys/dev/netif/sbni/if_sbni.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.1.2.4 2002/08/11 09:32:00 fjoe Exp $ - * $DragonFly: src/sys/dev/netif/sbni/if_sbni.c,v 1.15 2004/07/23 07:16:28 joerg Exp $ + * $DragonFly: src/sys/dev/netif/sbni/if_sbni.c,v 1.16 2004/09/15 00:39:53 joerg Exp $ */ /* @@ -226,7 +226,7 @@ sbni_attach(struct sbni_softc *sc, int unit, struct sbni_flags flags) sbni_outb(sc, CSR0, 0); set_initial_values(sc, flags); - callout_handle_init(&sc->wch); + callout_init(&sc->sbni_stat_timer); /* Initialize ifnet structure */ ifp->if_softc = sc; if_initname(ifp, "sbni", unit); @@ -279,7 +279,7 @@ sbni_init(void *xsc) s = splimp(); ifp->if_timer = 0; card_start(sc); - sc->wch = timeout(sbni_timeout, sc, hz/SBNI_HZ); + callout_reset(&sc->sbni_stat_timer,hz / SBNI_HZ, sbni_timeout, sc); ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; @@ -310,8 +310,7 @@ sbni_stop(struct sbni_softc *sc) sc->rx_buf_p = NULL; } - untimeout(sbni_timeout, sc, sc->wch); - sc->wch.callout = NULL; + callout_stop(&sc->sbni_stat_timer); } /* -------------------------------------------------------------------------- */ @@ -897,7 +896,7 @@ sbni_timeout(void *xsc) } sbni_outb(sc, CSR0, csr0 | RC_CHK); - sc->wch = timeout(sbni_timeout, sc, hz/SBNI_HZ); + callout_reset(&sc->sbni_stat_timer, hz / SBNI_HZ, sbni_timeout, sc); splx(s); } diff --git a/sys/dev/netif/sbni/if_sbnivar.h b/sys/dev/netif/sbni/if_sbnivar.h index 992966a20f..f2a461ae9a 100644 --- a/sys/dev/netif/sbni/if_sbnivar.h +++ b/sys/dev/netif/sbni/if_sbnivar.h @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sbni/if_sbnivar.h,v 1.1.2.3 2002/08/11 09:32:00 fjoe Exp $ - * $DragonFly: src/sys/dev/netif/sbni/if_sbnivar.h,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sbni/if_sbnivar.h,v 1.3 2004/09/15 00:39:53 joerg Exp $ */ /* @@ -111,7 +111,7 @@ struct sbni_softc { struct sbni_csr1 csr1; /* current value of CSR1 */ struct sbni_in_stats in_stats; /* internal statistics */ - struct callout_handle wch; + struct callout sbni_stat_timer; struct sbni_softc *slave_sc; diff --git a/sys/dev/netif/sf/if_sf.c b/sys/dev/netif/sf/if_sf.c index 039594ca8e..d609c9ee1b 100644 --- a/sys/dev/netif/sf/if_sf.c +++ b/sys/dev/netif/sf/if_sf.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $ - * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.11 2004/07/23 07:16:28 joerg Exp $ + * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.12 2004/09/15 00:41:53 joerg Exp $ * * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $ */ @@ -767,7 +767,7 @@ static int sf_attach(dev) goto fail; } - callout_handle_init(&sc->sf_stat_ch); + callout_init(&sc->sf_stat_timer); /* Reset the adapter. */ sf_reset(sc); @@ -1125,8 +1125,7 @@ static void sf_intr(arg) if (status & SF_ISR_ABNORMALINTR) { if (status & SF_ISR_STATSOFLOW) { - untimeout(sf_stats_update, sc, - sc->sf_stat_ch); + callout_stop(&sc->sf_stat_timer); sf_stats_update(sc); } else sf_init(sc); @@ -1250,7 +1249,7 @@ static void sf_init(xsc) ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; - sc->sf_stat_ch = timeout(sf_stats_update, sc, hz); + callout_reset(&sc->sf_stat_timer, hz, sf_stats_update, sc); splx(s); @@ -1402,7 +1401,7 @@ static void sf_stop(sc) ifp = &sc->arpcom.ac_if; - untimeout(sf_stats_update, sc, sc->sf_stat_ch); + callout_stop(&sc->sf_stat_timer); csr_write_4(sc, SF_GEN_ETH_CTL, 0); csr_write_4(sc, SF_CQ_CONSIDX, 0); @@ -1481,7 +1480,7 @@ static void sf_stats_update(xsc) sf_start(ifp); } - sc->sf_stat_ch = timeout(sf_stats_update, sc, hz); + callout_reset(&sc->sf_stat_timer, hz, sf_stats_update, sc); splx(s); diff --git a/sys/dev/netif/sf/if_sfreg.h b/sys/dev/netif/sf/if_sfreg.h index 1b7ed45c9b..6bc395df5d 100644 --- a/sys/dev/netif/sf/if_sfreg.h +++ b/sys/dev/netif/sf/if_sfreg.h @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sfreg.h,v 1.6.2.1 2001/08/16 20:35:04 wpaul Exp $ - * $DragonFly: src/sys/dev/netif/sf/if_sfreg.h,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sf/if_sfreg.h,v 1.3 2004/09/15 00:41:53 joerg Exp $ */ /* @@ -1045,7 +1045,7 @@ struct sf_softc { int sf_tx_cnt; u_int8_t sf_link; int sf_if_flags; - struct callout_handle sf_stat_ch; + struct callout sf_stat_timer; }; #define SF_TIMEOUT 1000 -- 2.41.0