Undo this for now. It's "right", but it means everything will rely on
the ar9130 code. Since at least one kernel config specifies individual ath HAL chips rather than just "device ath_hal" (arm/AVILA), I'm doing this so people aren't caught out when they update to -HEAD or 9.0 and discover their ath setup doesn't compile. I'll revisit this with a proper fix sometime before 9.0-RELEASE. Approved by: re (kib, blanket) Pointed out by: ray@ Pointy hat to: adrian@
This commit is contained in:
parent
8eb43d357c
commit
625b09b021
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=224644
@ -28,8 +28,6 @@
|
||||
#include "ar5416/ar5416reg.h"
|
||||
#include "ar5416/ar5416phy.h"
|
||||
|
||||
#include "ar9001/ar9130_eeprom.h"
|
||||
|
||||
#include "ar9002/ar9280v1.ini"
|
||||
#include "ar9002/ar9280v2.ini"
|
||||
#include "ar9002/ar9280_olc.h"
|
||||
@ -193,12 +191,6 @@ ar9280Attach(uint16_t devid, HAL_SOFTC sc,
|
||||
AH5416(ah)->ah_rx_chainmask = AR9280_DEFAULT_RXCHAINMASK;
|
||||
AH5416(ah)->ah_tx_chainmask = AR9280_DEFAULT_TXCHAINMASK;
|
||||
|
||||
if (eepromdata) {
|
||||
AH_PRIVATE((ah))->ah_eepromRead = ar9130EepromRead;
|
||||
AH_PRIVATE((ah))->ah_eepromWrite = NULL;
|
||||
ah->ah_eepromdata = eepromdata;
|
||||
}
|
||||
|
||||
if (!ar5416SetResetReg(ah, HAL_RESET_POWER_ON)) {
|
||||
/* reset chip */
|
||||
HALDEBUG(ah, HAL_DEBUG_ANY, "%s: couldn't reset chip\n",
|
||||
|
@ -29,8 +29,6 @@
|
||||
#include "ar5416/ar5416reg.h"
|
||||
#include "ar5416/ar5416phy.h"
|
||||
|
||||
#include "ar9001/ar9130_eeprom.h"
|
||||
|
||||
#include "ar9002/ar9285.ini"
|
||||
#include "ar9002/ar9285v2.ini"
|
||||
#include "ar9002/ar9280v2.ini" /* XXX ini for tx/rx gain */
|
||||
@ -155,13 +153,7 @@ ar9285Attach(uint16_t devid, HAL_SOFTC sc,
|
||||
AH5416(ah)->ah_writeIni = ar9285WriteIni;
|
||||
AH5416(ah)->ah_rx_chainmask = AR9285_DEFAULT_RXCHAINMASK;
|
||||
AH5416(ah)->ah_tx_chainmask = AR9285_DEFAULT_TXCHAINMASK;
|
||||
|
||||
if (eepromdata) {
|
||||
AH_PRIVATE((ah))->ah_eepromRead = ar9130EepromRead;
|
||||
AH_PRIVATE((ah))->ah_eepromWrite = NULL;
|
||||
ah->ah_eepromdata = eepromdata;
|
||||
}
|
||||
|
||||
|
||||
ahp->ah_maxTxTrigLev = MAX_TX_FIFO_THRESHOLD >> 1;
|
||||
|
||||
if (!ar5416SetResetReg(ah, HAL_RESET_POWER_ON)) {
|
||||
|
@ -30,8 +30,6 @@
|
||||
#include "ar5416/ar5416reg.h"
|
||||
#include "ar5416/ar5416phy.h"
|
||||
|
||||
#include "ar9001/ar9130_eeprom.h"
|
||||
|
||||
#include "ar9002/ar9287_cal.h"
|
||||
#include "ar9002/ar9287_reset.h"
|
||||
#include "ar9002/ar9287_olc.h"
|
||||
@ -170,12 +168,6 @@ ar9287Attach(uint16_t devid, HAL_SOFTC sc,
|
||||
AH5416(ah)->ah_rx_chainmask = AR9287_DEFAULT_RXCHAINMASK;
|
||||
AH5416(ah)->ah_tx_chainmask = AR9287_DEFAULT_TXCHAINMASK;
|
||||
|
||||
if (eepromdata) {
|
||||
AH_PRIVATE((ah))->ah_eepromRead = ar9130EepromRead;
|
||||
AH_PRIVATE((ah))->ah_eepromWrite = NULL;
|
||||
ah->ah_eepromdata = eepromdata;
|
||||
}
|
||||
|
||||
if (!ar5416SetResetReg(ah, HAL_RESET_POWER_ON)) {
|
||||
/* reset chip */
|
||||
HALDEBUG(ah, HAL_DEBUG_ANY, "%s: couldn't reset chip\n",
|
||||
|
Loading…
Reference in New Issue
Block a user