diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2000-12-13 15:58:40 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2000-12-13 15:58:40 +0000 |
| commit | e092cf396887c8f66ec5060e3a99d72eed4da9f5 (patch) | |
| tree | fb0631505828643cb8f2aab0bf82b2ff16ea2878 | |
| parent | d4850aed5f28230cd99c4806d615e2de64a8203e (diff) | |
new timeouts; hmm why it's not in generic?
| -rw-r--r-- | sys/dev/ic/rln.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/rlnvar.h | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys/dev/ic/rln.c b/sys/dev/ic/rln.c index 783adc60bcc..7582c4789a2 100644 --- a/sys/dev/ic/rln.c +++ b/sys/dev/ic/rln.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rln.c,v 1.7 1999/12/08 06:08:05 itojun Exp $ */ +/* $OpenBSD: rln.c,v 1.8 2000/12/13 15:58:39 mickey Exp $ */ /* * David Leonard <d@openbsd.org>, 1999. Public Domain. * @@ -133,6 +133,8 @@ rlnconfig(sc) } printf(", addr %s", ether_sprintf(sc->sc_arpcom.ac_enaddr)); + timeout_set(&sc->sc_timeout, rlnsoftintr, sc); + /* Attach as a network interface. */ bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ); ifp->if_softc = sc; @@ -421,7 +423,7 @@ rlnintr(arg) rlnsoftintr(sc); else /* Handle later. */ - timeout(rlnsoftintr, sc, 1); + timeout_add(&sc->sc_timeout, 1); return (1); } diff --git a/sys/dev/ic/rlnvar.h b/sys/dev/ic/rlnvar.h index ad5a37a56f3..28ee87d7387 100644 --- a/sys/dev/ic/rlnvar.h +++ b/sys/dev/ic/rlnvar.h @@ -1,10 +1,12 @@ -/* $OpenBSD: rlnvar.h,v 1.3 2000/02/05 13:55:46 d Exp $ */ +/* $OpenBSD: rlnvar.h,v 1.4 2000/12/13 15:58:39 mickey Exp $ */ /* * David Leonard <d@openbsd.org>, 1999. Public domain. * * Proxim RangeLAN2 soft state copy. */ +#include <sys/timeout.h> + /* * Mailboxes are used to communicate card-initiated messages * from the interrupt handler to other kernel threads. @@ -29,6 +31,7 @@ struct rln_softc { struct arpcom sc_arpcom; /* Ethernet common part */ bus_space_tag_t sc_iot; /* Bus cookie */ bus_space_handle_t sc_ioh; /* Bus i/o handle */ + struct timeout sc_timeout; u_int8_t sc_width; /* Bus transfer width */ u_int8_t sc_irq; /* IRQ for card */ |