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-hw.h | |
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-hw.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h index 6649f7b55650..9330b5a1aab8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h +++ b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h | |||
@@ -89,7 +89,7 @@ | |||
89 | #define LONG_SLOT_TIME 20 | 89 | #define LONG_SLOT_TIME 20 |
90 | 90 | ||
91 | /* RSSI to dBm */ | 91 | /* RSSI to dBm */ |
92 | #define IWL_RSSI_OFFSET 44 | 92 | #define IWL49_RSSI_OFFSET 44 |
93 | 93 | ||
94 | 94 | ||
95 | 95 | ||
@@ -129,24 +129,26 @@ | |||
129 | 129 | ||
130 | /* Sizes and addresses for instruction and data memory (SRAM) in | 130 | /* Sizes and addresses for instruction and data memory (SRAM) in |
131 | * 4965's embedded processor. Driver access is via HBUS_TARG_MEM_* regs. */ | 131 | * 4965's embedded processor. Driver access is via HBUS_TARG_MEM_* regs. */ |
132 | #define RTC_INST_LOWER_BOUND (0x000000) | 132 | #define IWL49_RTC_INST_LOWER_BOUND (0x000000) |
133 | #define IWL49_RTC_INST_UPPER_BOUND (0x018000) | 133 | #define IWL49_RTC_INST_UPPER_BOUND (0x018000) |
134 | 134 | ||
135 | #define RTC_DATA_LOWER_BOUND (0x800000) | 135 | #define IWL49_RTC_DATA_LOWER_BOUND (0x800000) |
136 | #define IWL49_RTC_DATA_UPPER_BOUND (0x80A000) | 136 | #define IWL49_RTC_DATA_UPPER_BOUND (0x80A000) |
137 | 137 | ||
138 | #define IWL49_RTC_INST_SIZE (IWL49_RTC_INST_UPPER_BOUND - RTC_INST_LOWER_BOUND) | 138 | #define IWL49_RTC_INST_SIZE (IWL49_RTC_INST_UPPER_BOUND - \ |
139 | #define IWL49_RTC_DATA_SIZE (IWL49_RTC_DATA_UPPER_BOUND - RTC_DATA_LOWER_BOUND) | 139 | IWL49_RTC_INST_LOWER_BOUND) |
140 | #define IWL49_RTC_DATA_SIZE (IWL49_RTC_DATA_UPPER_BOUND - \ | ||
141 | IWL49_RTC_DATA_LOWER_BOUND) | ||
140 | 142 | ||
141 | #define IWL_MAX_INST_SIZE IWL49_RTC_INST_SIZE | 143 | #define IWL49_MAX_INST_SIZE IWL49_RTC_INST_SIZE |
142 | #define IWL_MAX_DATA_SIZE IWL49_RTC_DATA_SIZE | 144 | #define IWL49_MAX_DATA_SIZE IWL49_RTC_DATA_SIZE |
143 | 145 | ||
144 | /* Size of uCode instruction memory in bootstrap state machine */ | 146 | /* Size of uCode instruction memory in bootstrap state machine */ |
145 | #define IWL_MAX_BSM_SIZE BSM_SRAM_SIZE | 147 | #define IWL49_MAX_BSM_SIZE BSM_SRAM_SIZE |
146 | 148 | ||
147 | static inline int iwl4965_hw_valid_rtc_data_addr(u32 addr) | 149 | static inline int iwl4965_hw_valid_rtc_data_addr(u32 addr) |
148 | { | 150 | { |
149 | return (addr >= RTC_DATA_LOWER_BOUND) && | 151 | return (addr >= IWL49_RTC_DATA_LOWER_BOUND) && |
150 | (addr < IWL49_RTC_DATA_UPPER_BOUND); | 152 | (addr < IWL49_RTC_DATA_UPPER_BOUND); |
151 | } | 153 | } |
152 | 154 | ||