diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-05-29 04:34:51 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-06-03 15:00:19 -0400 |
commit | 2d87889f61e97194891f7e7ff3a0e5f11e4392db (patch) | |
tree | d4495f79f2280d3453f467293edbe9f9ec9eced9 /drivers/net/wireless/iwlwifi/iwl-4965.c | |
parent | 95b1a8224abf6230899856753c5506a3f737a65b (diff) |
iwlwifi: mark 4965 ucode types
This patch marks 4965 ucode types.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index ca9ca92bb7fd..063ba2ec1ebd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -162,9 +162,10 @@ static int iwl4965_load_bsm(struct iwl_priv *priv) | |||
162 | 162 | ||
163 | /* Tell bootstrap uCode where to find the "Initialize" uCode | 163 | /* Tell bootstrap uCode where to find the "Initialize" uCode |
164 | * in host DRAM ... host DRAM physical address bits 35:4 for 4965. | 164 | * in host DRAM ... host DRAM physical address bits 35:4 for 4965. |
165 | * NOTE: iwl4965_initialize_alive_start() will replace these values, | 165 | * NOTE: iwl_init_alive_start() will replace these values, |
166 | * after the "initialize" uCode has run, to point to | 166 | * after the "initialize" uCode has run, to point to |
167 | * runtime/protocol instructions and backup data cache. */ | 167 | * runtime/protocol instructions and backup data cache. |
168 | */ | ||
168 | pinst = priv->ucode_init.p_addr >> 4; | 169 | pinst = priv->ucode_init.p_addr >> 4; |
169 | pdata = priv->ucode_init_data.p_addr >> 4; | 170 | pdata = priv->ucode_init_data.p_addr >> 4; |
170 | inst_len = priv->ucode_init.len; | 171 | inst_len = priv->ucode_init.len; |
@@ -220,6 +221,8 @@ static int iwl4965_load_bsm(struct iwl_priv *priv) | |||
220 | 221 | ||
221 | iwl_release_nic_access(priv); | 222 | iwl_release_nic_access(priv); |
222 | 223 | ||
224 | priv->ucode_type = UCODE_INIT; | ||
225 | |||
223 | return 0; | 226 | return 0; |
224 | } | 227 | } |
225 | 228 | ||
@@ -266,6 +269,8 @@ static int iwl4965_set_ucode_ptrs(struct iwl_priv *priv) | |||
266 | 269 | ||
267 | IWL_DEBUG_INFO("Runtime uCode pointers are set.\n"); | 270 | IWL_DEBUG_INFO("Runtime uCode pointers are set.\n"); |
268 | 271 | ||
272 | priv->ucode_type = UCODE_RT; | ||
273 | |||
269 | return ret; | 274 | return ret; |
270 | } | 275 | } |
271 | 276 | ||