diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2008-12-18 21:37:11 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 15:58:57 -0500 |
commit | 250bdd216c95907760b3fcc3aac1ed436d21c66c (patch) | |
tree | 82f3c0834b1529d3e283833d48ff70b76248168e /drivers/net/wireless/iwlwifi/iwl-4965.c | |
parent | 0f741d9992ad043026218677c06042ac9f834f8f (diff) |
iwl3945: Have consistant and not redefined HW constants
SRAM addresses are different for 3945, 4065, and 5000, let's give them
different names.
Also, the RSSI_OFFSET is different for 3945 and 4965, thus they should be
named differently.
Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@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-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index bb9617092c4..48223627dd2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -149,7 +149,7 @@ static int iwl4965_load_bsm(struct iwl_priv *priv) | |||
149 | priv->ucode_type = UCODE_RT; | 149 | priv->ucode_type = UCODE_RT; |
150 | 150 | ||
151 | /* make sure bootstrap program is no larger than BSM's SRAM size */ | 151 | /* make sure bootstrap program is no larger than BSM's SRAM size */ |
152 | if (len > IWL_MAX_BSM_SIZE) | 152 | if (len > IWL49_MAX_BSM_SIZE) |
153 | return -EINVAL; | 153 | return -EINVAL; |
154 | 154 | ||
155 | /* Tell bootstrap uCode where to find the "Initialize" uCode | 155 | /* Tell bootstrap uCode where to find the "Initialize" uCode |
@@ -186,7 +186,7 @@ static int iwl4965_load_bsm(struct iwl_priv *priv) | |||
186 | 186 | ||
187 | /* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */ | 187 | /* Tell BSM to copy from BSM SRAM into instruction SRAM, when asked */ |
188 | iwl_write_prph(priv, BSM_WR_MEM_SRC_REG, 0x0); | 188 | iwl_write_prph(priv, BSM_WR_MEM_SRC_REG, 0x0); |
189 | iwl_write_prph(priv, BSM_WR_MEM_DST_REG, RTC_INST_LOWER_BOUND); | 189 | iwl_write_prph(priv, BSM_WR_MEM_DST_REG, IWL49_RTC_INST_LOWER_BOUND); |
190 | iwl_write_prph(priv, BSM_WR_DWCOUNT_REG, len / sizeof(u32)); | 190 | iwl_write_prph(priv, BSM_WR_DWCOUNT_REG, len / sizeof(u32)); |
191 | 191 | ||
192 | /* Load bootstrap code into instruction SRAM now, | 192 | /* Load bootstrap code into instruction SRAM now, |
@@ -2246,7 +2246,7 @@ static int iwl4965_calc_rssi(struct iwl_priv *priv, | |||
2246 | 2246 | ||
2247 | /* dBm = max_rssi dB - agc dB - constant. | 2247 | /* dBm = max_rssi dB - agc dB - constant. |
2248 | * Higher AGC (higher radio gain) means lower signal. */ | 2248 | * Higher AGC (higher radio gain) means lower signal. */ |
2249 | return max_rssi - agc - IWL_RSSI_OFFSET; | 2249 | return max_rssi - agc - IWL49_RSSI_OFFSET; |
2250 | } | 2250 | } |
2251 | 2251 | ||
2252 | 2252 | ||