diff options
| author |   blambert <blambert@openbsd.org> | 2009-07-28 11:45:05 +0000 |
|---|---|---|
| committer | blambert <blambert@openbsd.org> | 2009-07-28 11:45:05 +0000 |
| commit | 2729d84df691ba9c9306155374c8934ee182e902 (patch) | |
| tree | aab9bc6de820c4b05c77a934fdcf959bddea4cf0 | |
| parent | timeout_add -> timout_add_msec (diff) | |
| download | wireguard-openbsd-2729d84df691ba9c9306155374c8934ee182e902.tar.xz wireguard-openbsd-2729d84df691ba9c9306155374c8934ee182e902.zip | |
timeout_add -> timeout_add_msec
ok jsg@
| -rw-r--r-- | sys/dev/ic/rtw.c | 10 | ||||
| -rw-r--r-- | sys/dev/ic/rtwvar.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c index add5a908542..53d6f72da68 100644 --- a/sys/dev/ic/rtw.c +++ b/sys/dev/ic/rtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtw.c,v 1.73 2009/03/29 21:53:52 sthen Exp $ */ +/* $OpenBSD: rtw.c,v 1.74 2009/07/28 11:45:05 blambert Exp $ */ /* $NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */ /*- @@ -2498,8 +2498,8 @@ rtw_led_newstate(struct rtw_softc *sc, enum ieee80211_state nstate) ls->ls_default = 0; break; case IEEE80211_S_SCAN: - timeout_add(&ls->ls_slow_ch, RTW_LED_SLOW_TICKS); - timeout_add(&ls->ls_fast_ch, RTW_LED_FAST_TICKS); + timeout_add_msec(&ls->ls_slow_ch, RTW_LED_SLOW_MSEC); + timeout_add_msec(&ls->ls_fast_ch, RTW_LED_FAST_MSEC); /*FALLTHROUGH*/ case IEEE80211_S_AUTH: case IEEE80211_S_ASSOC: @@ -2587,7 +2587,7 @@ rtw_led_fastblink(void *arg) rtw_led_set(ls, &sc->sc_regs, sc->sc_hwverid); splx(s); - timeout_add(&ls->ls_fast_ch, RTW_LED_FAST_TICKS); + timeout_add_msec(&ls->ls_fast_ch, RTW_LED_FAST_MSEC); } void @@ -2601,7 +2601,7 @@ rtw_led_slowblink(void *arg) ls->ls_state ^= RTW_LED_S_SLOW; rtw_led_set(ls, &sc->sc_regs, sc->sc_hwverid); splx(s); - timeout_add(&ls->ls_slow_ch, RTW_LED_SLOW_TICKS); + timeout_add_msec(&ls->ls_slow_ch, RTW_LED_SLOW_MSEC); } void diff --git a/sys/dev/ic/rtwvar.h b/sys/dev/ic/rtwvar.h index 7ba22468590..7fd69907160 100644 --- a/sys/dev/ic/rtwvar.h +++ b/sys/dev/ic/rtwvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtwvar.h,v 1.25 2009/06/10 18:41:07 miod Exp $ */ +/* $OpenBSD: rtwvar.h,v 1.26 2009/07/28 11:45:05 blambert Exp $ */ /* $NetBSD: rtwvar.h,v 1.10 2004/12/26 22:37:57 mycroft Exp $ */ /*- @@ -335,8 +335,8 @@ union rtw_keys { u_int32_t rk_words[16]; }; -#define RTW_LED_SLOW_TICKS MAX(1, hz/2) -#define RTW_LED_FAST_TICKS MAX(1, hz/10) +#define RTW_LED_SLOW_MSEC 500 +#define RTW_LED_FAST_MSEC 100 struct rtw_led_state { #define RTW_LED0 0x1 |