diff options
| author | Eytan Lifshitz <eytan.lifshitz@intel.com> | 2012-12-01 13:59:49 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-12-06 16:21:38 -0500 |
| commit | b7998c8b4459deff3ea9c939e90812439423ab89 (patch) | |
| tree | bbf1dbd2d390f9829b0344cec0b1098acbd893d0 /drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | |
| parent | 59f547ac5ba71a01232b023cb80f1fe05739dbbf (diff) | |
iwlwifi: Change define and struct names in iwl-eeprom-parse.h
Since we will have several forms of NVM (EEPROM, OTP, etc.)
and they will have different layouts, make the parsed data
more generic. This allows functional code to be independent
of a specific layout.
Also change some variables and function names from having
"eeprom" to "nvm" in their name.
Signed-off-by: Eytan Lifshitz <eytan.lifshitz@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h index a5e425718f56..555f0eb61d48 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | |||
| @@ -66,22 +66,7 @@ | |||
| 66 | #include <linux/if_ether.h> | 66 | #include <linux/if_ether.h> |
| 67 | #include "iwl-trans.h" | 67 | #include "iwl-trans.h" |
| 68 | 68 | ||
| 69 | /* SKU Capabilities (actual values from EEPROM definition) */ | 69 | struct iwl_nvm_data { |
| 70 | #define EEPROM_SKU_CAP_BAND_24GHZ (1 << 4) | ||
| 71 | #define EEPROM_SKU_CAP_BAND_52GHZ (1 << 5) | ||
| 72 | #define EEPROM_SKU_CAP_11N_ENABLE (1 << 6) | ||
| 73 | #define EEPROM_SKU_CAP_AMT_ENABLE (1 << 7) | ||
| 74 | #define EEPROM_SKU_CAP_IPAN_ENABLE (1 << 8) | ||
| 75 | |||
| 76 | /* radio config bits (actual values from EEPROM definition) */ | ||
| 77 | #define EEPROM_RF_CFG_TYPE_MSK(x) (x & 0x3) /* bits 0-1 */ | ||
| 78 | #define EEPROM_RF_CFG_STEP_MSK(x) ((x >> 2) & 0x3) /* bits 2-3 */ | ||
| 79 | #define EEPROM_RF_CFG_DASH_MSK(x) ((x >> 4) & 0x3) /* bits 4-5 */ | ||
| 80 | #define EEPROM_RF_CFG_PNUM_MSK(x) ((x >> 6) & 0x3) /* bits 6-7 */ | ||
| 81 | #define EEPROM_RF_CFG_TX_ANT_MSK(x) ((x >> 8) & 0xF) /* bits 8-11 */ | ||
| 82 | #define EEPROM_RF_CFG_RX_ANT_MSK(x) ((x >> 12) & 0xF) /* bits 12-15 */ | ||
| 83 | |||
| 84 | struct iwl_eeprom_data { | ||
| 85 | int n_hw_addrs; | 70 | int n_hw_addrs; |
| 86 | u8 hw_addr[ETH_ALEN]; | 71 | u8 hw_addr[ETH_ALEN]; |
| 87 | 72 | ||
| @@ -93,13 +78,21 @@ struct iwl_eeprom_data { | |||
| 93 | __le16 kelvin_voltage; | 78 | __le16 kelvin_voltage; |
| 94 | __le16 xtal_calib[2]; | 79 | __le16 xtal_calib[2]; |
| 95 | 80 | ||
| 96 | u16 sku; | 81 | bool sku_cap_band_24GHz_enable; |
| 97 | u16 radio_cfg; | 82 | bool sku_cap_band_52GHz_enable; |
| 98 | u16 eeprom_version; | 83 | bool sku_cap_11n_enable; |
| 99 | s8 max_tx_pwr_half_dbm; | 84 | bool sku_cap_amt_enable; |
| 85 | bool sku_cap_ipan_enable; | ||
| 100 | 86 | ||
| 87 | u8 radio_cfg_type; | ||
| 88 | u8 radio_cfg_step; | ||
| 89 | u8 radio_cfg_dash; | ||
| 90 | u8 radio_cfg_pnum; | ||
| 101 | u8 valid_tx_ant, valid_rx_ant; | 91 | u8 valid_tx_ant, valid_rx_ant; |
| 102 | 92 | ||
| 93 | u16 nvm_version; | ||
| 94 | s8 max_tx_pwr_half_dbm; | ||
| 95 | |||
| 103 | struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS]; | 96 | struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS]; |
| 104 | struct ieee80211_channel channels[]; | 97 | struct ieee80211_channel channels[]; |
| 105 | }; | 98 | }; |
| @@ -115,22 +108,22 @@ struct iwl_eeprom_data { | |||
| 115 | * This function parses all EEPROM values we need and then | 108 | * This function parses all EEPROM values we need and then |
| 116 | * returns a (newly allocated) struct containing all the | 109 | * returns a (newly allocated) struct containing all the |
| 117 | * relevant values for driver use. The struct must be freed | 110 | * relevant values for driver use. The struct must be freed |
| 118 | * later with iwl_free_eeprom_data(). | 111 | * later with iwl_free_nvm_data(). |
| 119 | */ | 112 | */ |
| 120 | struct iwl_eeprom_data * | 113 | struct iwl_nvm_data * |
| 121 | iwl_parse_eeprom_data(struct device *dev, const struct iwl_cfg *cfg, | 114 | iwl_parse_eeprom_data(struct device *dev, const struct iwl_cfg *cfg, |
| 122 | const u8 *eeprom, size_t eeprom_size); | 115 | const u8 *eeprom, size_t eeprom_size); |
| 123 | 116 | ||
| 124 | /** | 117 | /** |
| 125 | * iwl_free_eeprom_data - free EEPROM data | 118 | * iwl_free_nvm_data - free NVM data |
| 126 | * @data: the data to free | 119 | * @data: the data to free |
| 127 | */ | 120 | */ |
| 128 | static inline void iwl_free_eeprom_data(struct iwl_eeprom_data *data) | 121 | static inline void iwl_free_nvm_data(struct iwl_nvm_data *data) |
| 129 | { | 122 | { |
| 130 | kfree(data); | 123 | kfree(data); |
| 131 | } | 124 | } |
| 132 | 125 | ||
| 133 | int iwl_eeprom_check_version(struct iwl_eeprom_data *data, | 126 | int iwl_nvm_check_version(struct iwl_nvm_data *data, |
| 134 | struct iwl_trans *trans); | 127 | struct iwl_trans *trans); |
| 135 | 128 | ||
| 136 | #endif /* __iwl_eeprom_parse_h__ */ | 129 | #endif /* __iwl_eeprom_parse_h__ */ |