diff options
author | Don Fry <donald.h.fry@intel.com> | 2012-02-07 17:45:58 -0500 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-02-17 13:12:03 -0500 |
commit | b1c23d9ec3afb85bd299e4f3859dce555fd55c8a (patch) | |
tree | a161699a94caefbea117e62870b1d403bb99b911 /drivers/net/wireless/iwlwifi/iwl-ucode.h | |
parent | 7b11488fbbbe06ada39a396dec16532db8c933e6 (diff) |
iwlwifi: create iwl_nic structure
Create iwl_nic structure and link it together.
Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-ucode.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-ucode.h | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.h b/drivers/net/wireless/iwlwifi/iwl-ucode.h index eccf92519a84..18c77e9bb9b0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-ucode.h +++ b/drivers/net/wireless/iwlwifi/iwl-ucode.h | |||
@@ -63,6 +63,10 @@ | |||
63 | #ifndef __iwl_ucode_h__ | 63 | #ifndef __iwl_ucode_h__ |
64 | #define __iwl_ucode_h__ | 64 | #define __iwl_ucode_h__ |
65 | 65 | ||
66 | #include "iwl-trans.h" | ||
67 | |||
68 | #include <linux/netdevice.h> | ||
69 | |||
66 | /* v1/v2 uCode file layout */ | 70 | /* v1/v2 uCode file layout */ |
67 | struct iwl_ucode_header { | 71 | struct iwl_ucode_header { |
68 | __le32 ver; /* major/minor/API/serial */ | 72 | __le32 ver; /* major/minor/API/serial */ |
@@ -171,6 +175,39 @@ struct iwl_tlv_ucode_header { | |||
171 | u8 data[0]; | 175 | u8 data[0]; |
172 | }; | 176 | }; |
173 | 177 | ||
178 | struct iwl_ucode_capabilities { | ||
179 | u32 max_probe_length; | ||
180 | u32 standard_phy_calibration_size; | ||
181 | u32 flags; | ||
182 | }; | ||
183 | |||
184 | /** | ||
185 | * struct iwl_fw - variables associated with the firmware | ||
186 | * | ||
187 | * @ucode_ver: ucode version from the ucode file | ||
188 | * @fw_version: firmware version string | ||
189 | * @ucode_rt: run time ucode image | ||
190 | * @ucode_init: init ucode image | ||
191 | * @ucode_wowlan: wake on wireless ucode image (optional) | ||
192 | * @ucode_capa: capabilities parsed from the ucode file. | ||
193 | * @enhance_sensitivity_table: device can do enhanced sensitivity. | ||
194 | */ | ||
195 | struct iwl_fw { | ||
196 | |||
197 | /* ucode image and variables */ | ||
198 | u32 ucode_ver; /* version of ucode, copy of | ||
199 | iwl_ucode.ver */ | ||
200 | char fw_version[ETHTOOL_BUSINFO_LEN]; | ||
201 | |||
202 | /* ucode images */ | ||
203 | struct fw_img ucode_rt; | ||
204 | struct fw_img ucode_init; | ||
205 | struct fw_img ucode_wowlan; | ||
206 | |||
207 | struct iwl_ucode_capabilities ucode_capa; | ||
208 | bool enhance_sensitivity_table; | ||
209 | }; | ||
210 | |||
174 | struct iwl_priv; | 211 | struct iwl_priv; |
175 | 212 | ||
176 | int __must_check iwl_request_firmware(struct iwl_priv *priv, bool first); | 213 | int __must_check iwl_request_firmware(struct iwl_priv *priv, bool first); |