aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-eeprom.h
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2009-08-07 18:41:38 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-14 09:13:46 -0400
commit7aafef1c6e2e24f9a10dc2972bf0ee70624ccc47 (patch)
tree98cee2e028bc7fe7ea6fb2bac2a39780e78919d5 /drivers/net/wireless/iwlwifi/iwl-eeprom.h
parent3d816c77ecb05d3a3e974a205e53392e5353553e (diff)
iwlwifi: name changed from "fat" to "ht40"
Rename "fat" to "ht40" The term "fat channel" is deprecated in favor of "HT40" Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-eeprom.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-eeprom.h34
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
index 195b4ef12c27..05d4fc4451dc 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
@@ -88,10 +88,10 @@ struct iwl_priv;
88 * requirement for establishing a new network for legal operation on channels 88 * requirement for establishing a new network for legal operation on channels
89 * requiring RADAR detection or restricting ACTIVE scanning. 89 * requiring RADAR detection or restricting ACTIVE scanning.
90 * 90 *
91 * NOTE: "WIDE" flag does not indicate anything about "FAT" 40 MHz channels. 91 * NOTE: "WIDE" flag does not indicate anything about "HT40" 40 MHz channels.
92 * It only indicates that 20 MHz channel use is supported; FAT channel 92 * It only indicates that 20 MHz channel use is supported; HT40 channel
93 * usage is indicated by a separate set of regulatory flags for each 93 * usage is indicated by a separate set of regulatory flags for each
94 * FAT channel pair. 94 * HT40 channel pair.
95 * 95 *
96 * NOTE: Using a channel inappropriately will result in a uCode error! 96 * NOTE: Using a channel inappropriately will result in a uCode error!
97 */ 97 */
@@ -112,7 +112,7 @@ enum {
112#define EEPROM_SKU_CAP_HW_RF_KILL_ENABLE (1 << 1) 112#define EEPROM_SKU_CAP_HW_RF_KILL_ENABLE (1 << 1)
113 113
114/* *regulatory* channel data format in eeprom, one for each channel. 114/* *regulatory* channel data format in eeprom, one for each channel.
115 * There are separate entries for FAT (40 MHz) vs. normal (20 MHz) channels. */ 115 * There are separate entries for HT40 (40 MHz) vs. normal (20 MHz) channels. */
116struct iwl_eeprom_channel { 116struct iwl_eeprom_channel {
117 u8 flags; /* EEPROM_CHANNEL_* flags copied from EEPROM */ 117 u8 flags; /* EEPROM_CHANNEL_* flags copied from EEPROM */
118 s8 max_power_avg; /* max power (dBm) on this chnl, limit 31 */ 118 s8 max_power_avg; /* max power (dBm) on this chnl, limit 31 */
@@ -170,9 +170,9 @@ struct iwl_eeprom_channel {
170 | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 22 bytes */ 170 | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 22 bytes */
171#define EEPROM_5000_REG_BAND_5_CHANNELS ((0x74)\ 171#define EEPROM_5000_REG_BAND_5_CHANNELS ((0x74)\
172 | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 12 bytes */ 172 | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 12 bytes */
173#define EEPROM_5000_REG_BAND_24_FAT_CHANNELS ((0x82)\ 173#define EEPROM_5000_REG_BAND_24_HT40_CHANNELS ((0x82)\
174 | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 14 bytes */ 174 | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 14 bytes */
175#define EEPROM_5000_REG_BAND_52_FAT_CHANNELS ((0x92)\ 175#define EEPROM_5000_REG_BAND_52_HT40_CHANNELS ((0x92)\
176 | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 22 bytes */ 176 | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 22 bytes */
177 177
178/* 5050 Specific */ 178/* 5050 Specific */
@@ -313,7 +313,7 @@ struct iwl_eeprom_calib_info {
313 * in EEPROM containing EEPROM_CHANNEL_* usage flags (LSB) and max regulatory 313 * in EEPROM containing EEPROM_CHANNEL_* usage flags (LSB) and max regulatory
314 * txpower (MSB). 314 * txpower (MSB).
315 * 315 *
316 * Entries immediately below are for 20 MHz channel width. FAT (40 MHz) 316 * Entries immediately below are for 20 MHz channel width. HT40 (40 MHz)
317 * channels (only for 4965, not supported by 3945) appear later in the EEPROM. 317 * channels (only for 4965, not supported by 3945) appear later in the EEPROM.
318 * 318 *
319 * 2.4 GHz channels 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 319 * 2.4 GHz channels 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
@@ -352,29 +352,29 @@ struct iwl_eeprom_calib_info {
352#define EEPROM_REGULATORY_BAND_5_CHANNELS (2*0x99) /* 12 bytes */ 352#define EEPROM_REGULATORY_BAND_5_CHANNELS (2*0x99) /* 12 bytes */
353 353
354/* 354/*
355 * 2.4 GHz FAT channels 1 (5), 2 (6), 3 (7), 4 (8), 5 (9), 6 (10), 7 (11) 355 * 2.4 GHz HT40 channels 1 (5), 2 (6), 3 (7), 4 (8), 5 (9), 6 (10), 7 (11)
356 * 356 *
357 * The channel listed is the center of the lower 20 MHz half of the channel. 357 * The channel listed is the center of the lower 20 MHz half of the channel.
358 * The overall center frequency is actually 2 channels (10 MHz) above that, 358 * The overall center frequency is actually 2 channels (10 MHz) above that,
359 * and the upper half of each FAT channel is centered 4 channels (20 MHz) away 359 * and the upper half of each HT40 channel is centered 4 channels (20 MHz) away
360 * from the lower half; e.g. the upper half of FAT channel 1 is channel 5, 360 * from the lower half; e.g. the upper half of HT40 channel 1 is channel 5,
361 * and the overall FAT channel width centers on channel 3. 361 * and the overall HT40 channel width centers on channel 3.
362 * 362 *
363 * NOTE: The RXON command uses 20 MHz channel numbers to specify the 363 * NOTE: The RXON command uses 20 MHz channel numbers to specify the
364 * control channel to which to tune. RXON also specifies whether the 364 * control channel to which to tune. RXON also specifies whether the
365 * control channel is the upper or lower half of a FAT channel. 365 * control channel is the upper or lower half of a HT40 channel.
366 * 366 *
367 * NOTE: 4965 does not support FAT channels on 2.4 GHz. 367 * NOTE: 4965 does not support HT40 channels on 2.4 GHz.
368 */ 368 */
369#define EEPROM_4965_REGULATORY_BAND_24_FAT_CHANNELS (2*0xA0) /* 14 bytes */ 369#define EEPROM_4965_REGULATORY_BAND_24_HT40_CHANNELS (2*0xA0) /* 14 bytes */
370 370
371/* 371/*
372 * 5.2 GHz FAT channels 36 (40), 44 (48), 52 (56), 60 (64), 372 * 5.2 GHz HT40 channels 36 (40), 44 (48), 52 (56), 60 (64),
373 * 100 (104), 108 (112), 116 (120), 124 (128), 132 (136), 149 (153), 157 (161) 373 * 100 (104), 108 (112), 116 (120), 124 (128), 132 (136), 149 (153), 157 (161)
374 */ 374 */
375#define EEPROM_4965_REGULATORY_BAND_52_FAT_CHANNELS (2*0xA8) /* 22 bytes */ 375#define EEPROM_4965_REGULATORY_BAND_52_HT40_CHANNELS (2*0xA8) /* 22 bytes */
376 376
377#define EEPROM_REGULATORY_BAND_NO_FAT (0) 377#define EEPROM_REGULATORY_BAND_NO_HT40 (0)
378 378
379struct iwl_eeprom_ops { 379struct iwl_eeprom_ops {
380 const u32 regulatory_bands[7]; 380 const u32 regulatory_bands[7];