From 7824277e9ae9f1e55441bb10d986f43235fb5916 Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Tue, 14 Sep 2004 21:48:53 +0000
Subject: [PATCH] timeout/untimeout ==> callout_*

---
 sys/dev/netif/aue/if_aue.c    | 12 ++++++------
 sys/dev/netif/aue/if_auereg.h |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/dev/netif/aue/if_aue.c b/sys/dev/netif/aue/if_aue.c
index ffb1313ae1..454319acc0 100644
--- a/sys/dev/netif/aue/if_aue.c
+++ b/sys/dev/netif/aue/if_aue.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.78 2003/12/17 14:23:07 sanpei Exp $
- * $DragonFly: src/sys/dev/netif/aue/if_aue.c,v 1.13 2004/07/23 07:16:24 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/aue/if_aue.c,v 1.14 2004/09/14 21:48:53 joerg Exp $
  *
  * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.19.2.18 2003/06/14 15:56:48 trhodes Exp $
  */
@@ -670,6 +670,7 @@ USB_ATTACH(aue)
 
 	sc->aue_udev = uaa->device;
 	sc->aue_unit = device_get_unit(self);
+	callout_init(&sc->aue_stat_timer);
 
 	if (usbd_set_config_no(sc->aue_udev, AUE_CONFIG_NO, 0)) {
 		printf("aue%d: getting interface handle failed\n",
@@ -772,7 +773,6 @@ USB_ATTACH(aue)
 	 * Call MI attach routine.
 	 */
 	ether_ifattach(ifp, eaddr);
-	callout_handle_init(&sc->aue_stat_ch);
 	usb_register_netisr();
 	sc->aue_dying = 0;
 
@@ -791,7 +791,7 @@ aue_detach(device_ptr_t dev)
 	ifp = &sc->arpcom.ac_if;
 
 	sc->aue_dying = 1;
-	untimeout(aue_tick, sc, sc->aue_stat_ch);
+	callout_stop(&sc->aue_stat_timer);
 	ether_ifdetach(ifp);
 
 	if (sc->aue_ep[AUE_ENDPT_TX] != NULL)
@@ -1119,7 +1119,7 @@ aue_tick(void *xsc)
 			aue_start(ifp);
 	}
 
-	sc->aue_stat_ch = timeout(aue_tick, sc, hz);
+	callout_reset(&sc->aue_stat_timer, hz, aue_tick, sc);
 
 	AUE_UNLOCK(sc);
 
@@ -1320,7 +1320,7 @@ aue_init(void *xsc)
 	ifp->if_flags |= IFF_RUNNING;
 	ifp->if_flags &= ~IFF_OACTIVE;
 
-	sc->aue_stat_ch = timeout(aue_tick, sc, hz);
+	callout_reset(&sc->aue_stat_timer, hz, aue_tick, sc);
 
 	AUE_UNLOCK(sc);
 
@@ -1453,7 +1453,7 @@ aue_stop(struct aue_softc *sc)
 	aue_csr_write_1(sc, AUE_CTL0, 0);
 	aue_csr_write_1(sc, AUE_CTL1, 0);
 	aue_reset(sc);
-	untimeout(aue_tick, sc, sc->aue_stat_ch);
+	callout_stop(&sc->aue_stat_timer);
 
 	/* Stop transfers. */
 	if (sc->aue_ep[AUE_ENDPT_RX] != NULL) {
diff --git a/sys/dev/netif/aue/if_auereg.h b/sys/dev/netif/aue/if_auereg.h
index 4358a22e2f..f40f5d3b60 100644
--- a/sys/dev/netif/aue/if_auereg.h
+++ b/sys/dev/netif/aue/if_auereg.h
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/usb/if_auereg.h,v 1.17 2003/10/04 21:41:01 joe Exp $
- * $DragonFly: src/sys/dev/netif/aue/if_auereg.h,v 1.4 2004/02/11 15:05:03 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/aue/if_auereg.h,v 1.5 2004/09/14 21:48:53 joerg Exp $
  */
 
 /*
@@ -242,7 +242,7 @@ struct aue_softc {
 	u_int8_t		aue_link;
 	int			aue_if_flags;
 	struct aue_cdata	aue_cdata;
-	struct callout_handle	aue_stat_ch;
+	struct callout		aue_stat_timer;
 #if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 	struct mtx		aue_mtx;
 #endif
-- 
2.41.0