Author: adrian
Date: Mon Apr 11 11:15:34 2011
New Revision: 220539
URL: http://svn.freebsd.org/changeset/base/220539
Log:
De-dup the ar5416 rates array definition.
Modified:
head/sys/dev/ath/ath_hal/ar5416/ar5416.h
head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
head/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c
Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416.h Mon Apr 11 09:28:28 2011
(r220538)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416.h Mon Apr 11 11:15:34 2011
(r220539)
@@ -37,6 +37,19 @@ typedef struct {
uint16_t ext_center;
} CHAN_CENTERS;
+typedef enum Ar5416_Rates {
+ rate6mb, rate9mb, rate12mb, rate18mb,
+ rate24mb, rate36mb, rate48mb, rate54mb,
+ rate1l, rate2l, rate2s, rate5_5l,
+ rate5_5s, rate11l, rate11s, rateXr,
+ rateHt20_0, rateHt20_1, rateHt20_2, rateHt20_3,
+ rateHt20_4, rateHt20_5, rateHt20_6, rateHt20_7,
+ rateHt40_0, rateHt40_1, rateHt40_2, rateHt40_3,
+ rateHt40_4, rateHt40_5, rateHt40_6, rateHt40_7,
+ rateDupCck, rateDupOfdm, rateExtCck, rateExtOfdm,
+ Ar5416RateSize
+} AR5416_RATES;
+
#define AR5416_DEFAULT_RXCHAINMASK 7
#define AR5416_DEFAULT_TXCHAINMASK 1
#define AR5416_MAX_RATE_POWER 63
Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Mon Apr 11 09:28:28
2011 (r220538)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Mon Apr 11 11:15:34
2011 (r220539)
@@ -794,20 +794,6 @@ ar5416GetChipPowerLimits(struct ath_hal
return AH_TRUE;
}
-/* XXX gag, this is sick */
-typedef enum Ar5416_Rates {
- rate6mb, rate9mb, rate12mb, rate18mb,
- rate24mb, rate36mb, rate48mb, rate54mb,
- rate1l, rate2l, rate2s, rate5_5l,
- rate5_5s, rate11l, rate11s, rateXr,
- rateHt20_0, rateHt20_1, rateHt20_2, rateHt20_3,
- rateHt20_4, rateHt20_5, rateHt20_6, rateHt20_7,
- rateHt40_0, rateHt40_1, rateHt40_2, rateHt40_3,
- rateHt40_4, rateHt40_5, rateHt40_6, rateHt40_7,
- rateDupCck, rateDupOfdm, rateExtCck, rateExtOfdm,
- Ar5416RateSize
-} AR5416_RATES;
-
/**************************************************************
* ar5416SetTransmitPower
*
Modified: head/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c Mon Apr 11 09:28:28
2011 (r220538)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c Mon Apr 11 11:15:34
2011 (r220539)
@@ -67,20 +67,6 @@ static void ar9285GetGainBoundariesAndPd
uint16_t numXpdGains);
static uint16_t ar9285GetMaxEdgePower(uint16_t, CAL_CTL_EDGES *);
-/* XXX gag, this is sick */
-typedef enum Ar5416_Rates {
- rate6mb, rate9mb, rate12mb, rate18mb,
- rate24mb, rate36mb, rate48mb, rate54mb,
- rate1l, rate2l, rate2s, rate5_5l,
- rate5_5s, rate11l, rate11s, rateXr,
- rateHt20_0, rateHt20_1, rateHt20_2, rateHt20_3,
- rateHt20_4, rateHt20_5, rateHt20_6, rateHt20_7,
- rateHt40_0, rateHt40_1, rateHt40_2, rateHt40_3,
- rateHt40_4, rateHt40_5, rateHt40_6, rateHt40_7,
- rateDupCck, rateDupOfdm, rateExtCck, rateExtOfdm,
- Ar5416RateSize
-} AR5416_RATES;
-
HAL_BOOL
ar9285SetTransmitPower(struct ath_hal *ah,
const struct ieee80211_channel *chan, uint16_t *rfXpdGain)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
