d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The 6000 series adapters have a slightly different offset for band 6,

Browse Source 
2GHz HT40 channels.
This commit is contained in:
Bernhard Schmidt 2011-05-08 10:21:42 +00:00
parent 3016ab149d
commit 688f94830d
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/iwn/if_iwn.c
View File

@ -1784,7 +1784,10 @@ iwn5000_read_eeprom(struct iwn_softc *sc)
/* Read the list of authorized channels (20MHz ones only). */
for (i = 0; i < 5; i++) {
addr = base + iwn5000_regulatory_bands[i];
if (sc->hw_type >= IWN_HW_REV_TYPE_6000)
addr = base + iwn6000_regulatory_bands[i];
else
addr = base + iwn5000_regulatory_bands[i];
iwn_read_eeprom_channels(sc, i, addr);
}

11
sys/dev/iwn/if_iwnreg.h
View File

@ -1403,6 +1403,7 @@ struct iwn_fw_tlv {
#define IWN5000_EEPROM_BAND4 0x02e
#define IWN5000_EEPROM_BAND5 0x03a
#define IWN5000_EEPROM_BAND6 0x041
#define IWN6000_EEPROM_BAND6 0x040
#define IWN5000_EEPROM_BAND7 0x049
#define IWN6000_EEPROM_ENHINFO 0x054
#define IWN5000_EEPROM_CRYSTAL 0x128
@ -1486,6 +1487,16 @@ static const uint32_t iwn5000_regulatory_bands[IWN_NBANDS] = {
IWN5000_EEPROM_BAND7
};
static const uint32_t iwn6000_regulatory_bands[IWN_NBANDS] = {
IWN5000_EEPROM_BAND1,
IWN5000_EEPROM_BAND2,
IWN5000_EEPROM_BAND3,
IWN5000_EEPROM_BAND4,
IWN5000_EEPROM_BAND5,
IWN6000_EEPROM_BAND6,
IWN5000_EEPROM_BAND7
};
#define IWN_CHAN_BANDS_COUNT 7
#define IWN_MAX_CHAN_PER_BAND 14
static const struct iwn_chan_band {