diff options
| author | dyoung <dyoung@NetBSD.org> | 2004-02-29 00:47:21 +0000 |
|---|---|---|
| committer | dyoung <dyoung@NetBSD.org> | 2004-02-29 00:47:21 +0000 |
| commit | d68ab48dd5d0aa3498c2e8651ea3287d51c52f7e (patch) | |
| tree | 2dfdd6ef7df4682e17f9c498d3097e91c1bfac07 /sys/dev | |
| parent | 44eaa399823623c661e8d913b8a73d0d8bf38b7d (diff) | |
Update ath(4)'s Hardware Abstraction Layer (HAL) to version 0.9.6.11.
Both the API and ABI changed, hence the changes to so many .c and
.h files.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/ath.c | 13 | ||||
| -rw-r--r-- | sys/dev/ic/athvar.h | 10 |
2 files changed, 12 insertions, 11 deletions
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c index 0411df22289..6a567bc550f 100644 --- a/sys/dev/ic/ath.c +++ b/sys/dev/ic/ath.c @@ -1,4 +1,4 @@ -/* $NetBSD: ath.c,v 1.18 2003/12/16 06:48:09 dyoung Exp $ */ +/* $NetBSD: ath.c,v 1.19 2004/02/29 00:47:21 dyoung Exp $ */ /*- * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.36 2003/11/29 01:23:59 sam Exp $"); #endif #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.18 2003/12/16 06:48:09 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.19 2004/02/29 00:47:21 dyoung Exp $"); #endif /* @@ -1335,7 +1335,9 @@ ath_calcrxfilter(struct ath_softc *sc) static void ath_mode_init(struct ath_softc *sc) { +#ifdef __FreeBSD__ struct ieee80211com *ic = &sc->sc_ic; +#endif struct ath_hal *ah = sc->sc_ah; u_int32_t rfilt, mfilt[2]; @@ -1344,7 +1346,7 @@ ath_mode_init(struct ath_softc *sc) ath_hal_setrxfilter(ah, rfilt); /* configure operational mode */ - ath_hal_setopmode(ah, ic->ic_opmode); + ath_hal_setopmode(ah); /* calculate and install multicast filter */ #ifdef __FreeBSD__ @@ -1694,8 +1696,7 @@ ath_beacon_config(struct ath_softc *sc) DPRINTF(("%s: intval %u nexttbtt %u\n", __func__, ni->ni_intval, nexttbtt)); ath_hal_intrset(ah, 0); - ath_hal_beaconinit(ah, ic->ic_opmode, - nexttbtt, ni->ni_intval); + ath_hal_beaconinit(ah, nexttbtt, ni->ni_intval); if (ic->ic_opmode != IEEE80211_M_MONITOR) sc->sc_imask |= HAL_INT_SWBA; /* beacon prepare */ ath_hal_intrset(ah, sc->sc_imask); @@ -3133,7 +3134,7 @@ ath_getchannels(struct ath_softc *sc, u_int cc, HAL_BOOL outdoor) return ENOMEM; } if (!ath_hal_init_channels(ah, chans, IEEE80211_CHAN_MAX, &nchan, - cc, HAL_MODE_ALL, outdoor)) { + cc, HAL_MODE_ALL, outdoor, 0 /* no extended channels */)) { if_printf(ifp, "unable to collect channel list from hal\n"); free(chans, M_TEMP); return EINVAL; diff --git a/sys/dev/ic/athvar.h b/sys/dev/ic/athvar.h index b148f80ba88..00d15e738a0 100644 --- a/sys/dev/ic/athvar.h +++ b/sys/dev/ic/athvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: athvar.h,v 1.6 2003/12/16 06:48:09 dyoung Exp $ */ +/* $NetBSD: athvar.h,v 1.7 2004/02/29 00:47:21 dyoung Exp $ */ /*- * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting @@ -314,8 +314,8 @@ int ath_intr(void *); ((*(_ah)->ah_perCalibration)((_ah), (_chan))) #define ath_hal_setledstate(_ah, _state) \ ((*(_ah)->ah_setLedState)((_ah), (_state))) -#define ath_hal_beaconinit(_ah, _opmode, _nextb, _bperiod) \ - ((*(_ah)->ah_beaconInit)((_ah), (_opmode), (_nextb), (_bperiod))) +#define ath_hal_beaconinit(_ah, _nextb, _bperiod) \ + ((*(_ah)->ah_beaconInit)((_ah), (_nextb), (_bperiod))) #define ath_hal_beaconreset(_ah) \ ((*(_ah)->ah_resetStationBeaconTimers)((_ah))) #define ath_hal_beacontimers(_ah, _bs, _tsf, _dc, _cc) \ @@ -323,8 +323,8 @@ int ath_intr(void *); (_dc), (_cc))) #define ath_hal_setassocid(_ah, _bss, _associd) \ ((*(_ah)->ah_writeAssocid)((_ah), (_bss), (_associd), 0)) -#define ath_hal_setopmode(_ah, _opmode) \ - ((*(_ah)->ah_setPCUConfig)((_ah), (_opmode))) +#define ath_hal_setopmode(_ah) \ + ((*(_ah)->ah_setPCUConfig)((_ah))) #define ath_hal_stoptxdma(_ah, _qnum) \ ((*(_ah)->ah_stopTxDma)((_ah), (_qnum))) #define ath_hal_stoppcurecv(_ah) \ |
