diff options
| author | rpaulo <rpaulo@FreeBSD.org> | 2010-03-02 12:59:42 +0000 |
|---|---|---|
| committer | rpaulo <rpaulo@FreeBSD.org> | 2010-03-02 12:59:42 +0000 |
| commit | daccf654120791da2a3532d71d7c523ad28ea18a (patch) | |
| tree | e628ccb0357e719dd69ac3485b0801f0b2b23941 /sys/dev/ath/ath_hal/ar5416 | |
| parent | 8518ff96531e520a5c1c3439875e6831a19fcda9 (diff) | |
| download | FreeBSD-src-daccf654120791da2a3532d71d7c523ad28ea18a.zip FreeBSD-src-daccf654120791da2a3532d71d7c523ad28ea18a.tar.gz | |
Couple of suggestions from Sam regarding latest commit:
o rename the new variables to comply with the naming scheme
o move the new variables to an AR5212 specific struct
o use ahp when available
o revert to previous ts_flags check
Diffstat (limited to 'sys/dev/ath/ath_hal/ar5416')
| -rw-r--r-- | sys/dev/ath/ath_hal/ar5416/ar5416_reset.c | 3 | ||||
| -rw-r--r-- | sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c | 3 | ||||
| -rw-r--r-- | sys/dev/ath/ath_hal/ar5416/ar9285_attach.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c b/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c index 2950817..d506a6a 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c +++ b/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c @@ -436,6 +436,7 @@ ar5416ChannelChange(struct ath_hal *ah, const structu ieee80211_channel *chan) static void ar5416InitDMA(struct ath_hal *ah) { + struct ath_hal_5212 *ahp = AH5212(ah); /* * set AHB_MODE not to do cacheline prefetches @@ -457,7 +458,7 @@ ar5416InitDMA(struct ath_hal *ah) /* restore TX trigger level */ OS_REG_WRITE(ah, AR_TXCFG, (OS_REG_READ(ah, AR_TXCFG) &~ AR_FTRIG) | - SM(AH_PRIVATE(ah)->ah_txtrig_level, AR_FTRIG)); + SM(ahp->ah_txTrigLev, AR_FTRIG)); /* * Setup receive FIFO threshold to hold off TX activities diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c b/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c index 9805935..47277a1 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c +++ b/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c @@ -568,8 +568,7 @@ ar5416ProcTxDesc(struct ath_hal *ah, /* handle tx trigger level changes internally */ if ((ts->ts_status & HAL_TXERR_FIFO) || - (ts->ts_flags & HAL_TX_DATA_UNDERRUN) || - (ts->ts_flags & HAL_TX_DELIM_UNDERRUN)) + (ts->ts_flags & (HAL_TX_DATA_UNDERRUN | HAL_TX_DELIM_UNDERRUN))) ar5212UpdateTxTrigLevel(ah, AH_TRUE); return HAL_OK; diff --git a/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c b/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c index 6d4f25e..946133a 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c +++ b/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c @@ -122,7 +122,7 @@ ar9285Attach(uint16_t devid, HAL_SOFTC sc, AH5416(ah)->ah_rx_chainmask = AR9285_DEFAULT_RXCHAINMASK; AH5416(ah)->ah_tx_chainmask = AR9285_DEFAULT_TXCHAINMASK; - AH_PRIVATE(ah)->ah_max_txtrig_level = MAX_TX_FIFO_THRESHOLD >> 1; + ahp->ah_maxTxTrigLev = MAX_TX_FIFO_THRESHOLD >> 1; if (!ar5416SetResetReg(ah, HAL_RESET_POWER_ON)) { /* reset chip */ |
