CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src Committed By: christos Date: Sun Oct 9 14:40:47 UTC 2016 Modified Files: src/sys/external/isc/atheros_hal/dist/ar5416: ar5416_attach.c Log Message: PR/51540: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_attach.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_attach.c diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_attach.c:1.4 src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_attach.c:1.5 --- src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_attach.c:1.4 Mon Mar 7 06:25:44 2011 +++ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_attach.c Sun Oct 9 10:40:47 2016 @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5416_attach.c,v 1.4 2011/03/07 11:25:44 cegger Exp $ + * $Id: ar5416_attach.c,v 1.5 2016/10/09 14:40:47 christos Exp $ */ #include "opt_ah.h" @@ -86,8 +86,8 @@ ar5416InitState(struct ath_hal_5416 *ahp ah->ah_disable = ar5416Disable; ah->ah_configPCIE = ar5416ConfigPCIE; ah->ah_perCalibration = ar5416PerCalibration; - ah->ah_perCalibrationN = ar5416PerCalibrationN, - ah->ah_resetCalValid = ar5416ResetCalValid, + ah->ah_perCalibrationN = ar5416PerCalibrationN; + ah->ah_resetCalValid = ar5416ResetCalValid; ah->ah_setTxPowerLimit = ar5416SetTxPowerLimit; ah->ah_setTxPower = ar5416SetTransmitPower; ah->ah_setBoardValues = ar5416SetBoardValues; @@ -104,8 +104,8 @@ ar5416InitState(struct ath_hal_5416 *ahp ah->ah_stopPcuReceive = ar5416StopPcuReceive; ah->ah_setupRxDesc = ar5416SetupRxDesc; ah->ah_procRxDesc = ar5416ProcRxDesc; - ah->ah_rxMonitor = ar5416AniPoll, - ah->ah_procMibEvent = ar5416ProcessMibIntr, + ah->ah_rxMonitor = ar5416AniPoll; + ah->ah_procMibEvent = ar5416ProcessMibIntr; /* Misc Functions */ ah->ah_getDiagState = ar5416GetDiagState;
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:08:49 UTC 2013
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5416: ar5416_beacon.c
Log Message:
Remove unsued variable
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_beacon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_beacon.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_beacon.c:1.1.1.1 src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_beacon.c:1.2
--- src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_beacon.c:1.1.1.1 Thu Dec 11 04:46:47 2008
+++ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_beacon.c Thu Sep 12 12:08:49 2013
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ar5416_beacon.c,v 1.1.1.1 2008/12/11 04:46:47 alc Exp $
+ * $Id: ar5416_beacon.c,v 1.2 2013/09/12 12:08:49 martin Exp $
*/
#include opt_ah.h
@@ -138,7 +138,7 @@ ar5416ResetStaBeaconTimers(struct ath_ha
void
ar5416SetStaBeaconTimers(struct ath_hal *ah, const HAL_BEACON_STATE *bs)
{
- uint32_t nextTbtt, nextdtim,beaconintval, dtimperiod;
+ uint32_t nextTbtt,beaconintval, dtimperiod;
HALASSERT(bs-bs_intval != 0);
@@ -214,7 +214,6 @@ ar5416SetStaBeaconTimers(struct ath_hal
nextTbtt = bs-bs_nextdtim;
else
nextTbtt = bs-bs_nexttbtt;
- nextdtim = bs-bs_nextdtim;
OS_REG_WRITE(ah, AR_NEXT_DTIM,
TU_TO_USEC(bs-bs_nextdtim - SLEEP_SLOP));
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:10:11 UTC 2013
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5416: ar9280_attach.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/isc/atheros_hal/dist/ar5416/ar9280_attach.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/isc/atheros_hal/dist/ar5416/ar9280_attach.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar9280_attach.c:1.2 src/sys/external/isc/atheros_hal/dist/ar5416/ar9280_attach.c:1.3
--- src/sys/external/isc/atheros_hal/dist/ar5416/ar9280_attach.c:1.2 Mon Feb 21 11:06:38 2011
+++ src/sys/external/isc/atheros_hal/dist/ar5416/ar9280_attach.c Thu Sep 12 12:10:11 2013
@@ -306,13 +306,12 @@ ar9280ConfigPCIE(struct ath_hal *ah, HAL
static void
ar9280WriteIni(struct ath_hal *ah, HAL_CHANNEL_INTERNAL *chan)
{
- u_int modesIndex, freqIndex;
+ u_int modesIndex;
int regWrites = 0;
/* Setup the indices for the next set of register array writes */
/* XXX Ignore 11n dynamic mode on the AR5416 for the moment */
if (IS_CHAN_2GHZ(chan)) {
- freqIndex = 2;
if (IS_CHAN_HT40(chan))
modesIndex = 3;
else if (IS_CHAN_108G(chan))
@@ -320,7 +319,6 @@ ar9280WriteIni(struct ath_hal *ah, HAL_C
else
modesIndex = 4;
} else {
- freqIndex = 1;
if (IS_CHAN_HT40(chan) ||
IS_CHAN_TURBO(chan))
modesIndex = 2;
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:11:12 UTC 2013
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5416: ar9285_attach.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_attach.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_attach.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_attach.c:1.1 src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_attach.c:1.2
--- src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_attach.c:1.1 Mon Feb 21 11:06:38 2011
+++ src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_attach.c Thu Sep 12 12:11:12 2013
@@ -291,12 +291,11 @@ ar9285ConfigPCIE(struct ath_hal *ah, HAL
static void
ar9285WriteIni(struct ath_hal *ah, HAL_CHANNEL_INTERNAL *chan)
{
- u_int modesIndex, freqIndex;
+ u_int modesIndex;
int regWrites = 0;
/* Setup the indices for the next set of register array writes */
/* XXX Ignore 11n dynamic mode on the AR5416 for the moment */
- freqIndex = 2;
if (IS_CHAN_HT40(chan))
modesIndex = 3;
else if (IS_CHAN_108G(chan))
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src
Committed By: wiz
Date: Sun Feb 12 13:47:19 UTC 2012
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5416: ar5416_misc.c
Log Message:
Use correct return value. From clang via Henning Petersen in PR 45996.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_misc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_misc.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_misc.c:1.1.1.1 src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_misc.c:1.2
--- src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_misc.c:1.1.1.1 Thu Dec 11 04:46:48 2008
+++ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_misc.c Sun Feb 12 13:47:19 2012
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ar5416_misc.c,v 1.1.1.1 2008/12/11 04:46:48 alc Exp $
+ * $Id: ar5416_misc.c,v 1.2 2012/02/12 13:47:19 wiz Exp $
*/
#include opt_ah.h
@@ -113,7 +113,7 @@ ar5416SetAntennaSwitch(struct ath_hal *a
HAL_BOOL
ar5416SetDecompMask(struct ath_hal *ah, uint16_t keyidx, int en)
{
- return HAL_OK;
+ return AH_TRUE;
}
/* Setup coverage class */
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src
Committed By: wiz
Date: Sun Feb 12 13:55:27 UTC 2012
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5416: ar5416_reset.c
Log Message:
Consistently use ar5416SetPowerMode. From Henning Petersen in PR 45999.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_reset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_reset.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_reset.c:1.5 src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_reset.c:1.6
--- src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_reset.c:1.5 Mon Mar 7 11:25:44 2011
+++ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_reset.c Sun Feb 12 13:55:27 2012
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ar5416_reset.c,v 1.5 2011/03/07 11:25:44 cegger Exp $
+ * $Id: ar5416_reset.c,v 1.6 2012/02/12 13:55:27 wiz Exp $
*/
#include opt_ah.h
@@ -1028,7 +1028,7 @@ ar5416GetRfgain(struct ath_hal *ah)
HAL_BOOL
ar5416Disable(struct ath_hal *ah)
{
- if (!ar5212SetPowerMode(ah, HAL_PM_AWAKE, AH_TRUE))
+ if (!ar5416SetPowerMode(ah, HAL_PM_AWAKE, AH_TRUE))
return AH_FALSE;
return ar5416SetResetReg(ah, HAL_RESET_COLD);
}
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src Committed By: jmcneill Date: Mon Aug 1 10:21:32 UTC 2011 Modified Files: src/sys/external/isc/atheros_hal/dist/ar5416: ar5416reg.h Log Message: Fix AR_SREV_MERLIN_20 and AR_SREV_MERLIN_20_OR_LATER macros to match rev 2.1 as well as 2.0, from FreeBSD. Fixes 5GHz mode on my 9280. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h:1.4 src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h:1.5 --- src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h:1.4 Mon Mar 7 11:25:44 2011 +++ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416reg.h Mon Aug 1 10:21:32 2011 @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5416reg.h,v 1.4 2011/03/07 11:25:44 cegger Exp $ + * $Id: ar5416reg.h,v 1.5 2011/08/01 10:21:32 jmcneill Exp $ */ #ifndef _DEV_ATH_AR5416REG_H #define _DEV_ATH_AR5416REG_H @@ -609,10 +609,11 @@ (AH_PRIVATE((_ah))-ah_macVersion = AR_XSREV_VERSION_MERLIN) #define AR_SREV_MERLIN_20(_ah) \ (AR_SREV_MERLIN(_ah) \ - AH_PRIVATE((_ah))-ah_macRev == AR_XSREV_REVISION_MERLIN_20) + AH_PRIVATE((_ah))-ah_macRev = AR_XSREV_REVISION_MERLIN_20) #define AR_SREV_MERLIN_20_OR_LATER(_ah) \ - (AR_SREV_MERLIN_20(_ah) || \ - AH_PRIVATE((_ah))-ah_macVersion = AR_XSREV_VERSION_MERLIN) + ((AH_PRIVATE((_ah))-ah_macVersion AR_XSREV_VERSION_MERLIN) || \ + (AR_SREV_MERLIN((_ah)) \ + AH_PRIVATE((_ah))-ah_macRev = AR_XSREV_REVISION_MERLIN_20)) #define AR_SREV_KITE(_ah) \ (AH_PRIVATE((_ah))-ah_macVersion == AR_XSREV_VERSION_KITE)
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src
Committed By: joerg
Date: Mon May 30 13:57:21 UTC 2011
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5416: ar5416_eeprom.c
Log Message:
Silence warnings about unused return value for a dead hardware read.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_eeprom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_eeprom.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_eeprom.c:1.1.1.1 src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_eeprom.c:1.2
--- src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_eeprom.c:1.1.1.1 Thu Dec 11 04:46:48 2008
+++ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_eeprom.c Mon May 30 13:57:21 2011
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ar5416_eeprom.c,v 1.1.1.1 2008/12/11 04:46:48 alc Exp $
+ * $Id: ar5416_eeprom.c,v 1.2 2011/05/30 13:57:21 joerg Exp $
*/
#include opt_ah.h
@@ -34,7 +34,7 @@
HAL_BOOL
ar5416EepromRead(struct ath_hal *ah, u_int off, uint16_t *data)
{
-OS_REG_READ(ah, AR5416_EEPROM_OFFSET + (off AR5416_EEPROM_S));
+(void)OS_REG_READ(ah, AR5416_EEPROM_OFFSET + (off AR5416_EEPROM_S));
if (!ath_hal_wait(ah, AR_EEPROM_STATUS_DATA,
AR_EEPROM_STATUS_DATA_BUSY | AR_EEPROM_STATUS_DATA_PROT_ACCESS, 0))
return AH_FALSE;
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src
Committed By: cegger
Date: Mon Feb 21 13:04:22 UTC 2011
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5416: ar9285_reset.c
Log Message:
make it compile with ATHHAL_DEBUG
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_reset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_reset.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_reset.c:1.1 src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_reset.c:1.2
--- src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_reset.c:1.1 Mon Feb 21 11:06:38 2011
+++ src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_reset.c Mon Feb 21 13:04:22 2011
@@ -119,7 +119,7 @@
twiceMaxRegulatoryPower = AH_MIN(MAX_RATE_POWER, AH_PRIVATE(ah)-ah_powerLimit);
pModal = pEepData-modalHeader;
HALDEBUG(ah, HAL_DEBUG_RESET, %s Channel=%u CfgCtl=%u\n,
- __func__,chan-ic_freq, cfgCtl );
+ __func__,chan-channel, cfgCtl );
if (IS_EEP_MINOR_V2(ah)) {
ht40PowerIncForPdadc = pModal-ht40PowerIncForPdadc;
