aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl4965-base.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2007-10-25 05:15:36 -0400
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:03:17 -0500
commitaf7cca2a441f6e2ebeb2a920ef5af1bec8df96e8 (patch)
tree27a2322959e3ee82ae35a58b53c1a392c9736f1e /drivers/net/wireless/iwlwifi/iwl4965-base.c
parentd860965200c867e7e3e81ede8572cffff8c7eb24 (diff)
iwlwifi: rename restricted_mem to targ_mem
This patch renames restricted_mem suffix with more proper name targ_mem for function accessing memory on the nic in target mode 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/iwl4965-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl4965-base.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index e74f71fdaf92..5d19ce9bb1aa 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -4785,7 +4785,7 @@ static void iwl_dump_nic_error_log(struct iwl_priv *priv)
4785 return; 4785 return;
4786 } 4786 }
4787 4787
4788 count = iwl_read_restricted_mem(priv, base); 4788 count = iwl_read_targ_mem(priv, base);
4789 4789
4790 if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) { 4790 if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) {
4791 IWL_ERROR("Start IWL Error Log Dump:\n"); 4791 IWL_ERROR("Start IWL Error Log Dump:\n");
@@ -4793,15 +4793,15 @@ static void iwl_dump_nic_error_log(struct iwl_priv *priv)
4793 priv->status, priv->config, count); 4793 priv->status, priv->config, count);
4794 } 4794 }
4795 4795
4796 desc = iwl_read_restricted_mem(priv, base + 1 * sizeof(u32)); 4796 desc = iwl_read_targ_mem(priv, base + 1 * sizeof(u32));
4797 blink1 = iwl_read_restricted_mem(priv, base + 3 * sizeof(u32)); 4797 blink1 = iwl_read_targ_mem(priv, base + 3 * sizeof(u32));
4798 blink2 = iwl_read_restricted_mem(priv, base + 4 * sizeof(u32)); 4798 blink2 = iwl_read_targ_mem(priv, base + 4 * sizeof(u32));
4799 ilink1 = iwl_read_restricted_mem(priv, base + 5 * sizeof(u32)); 4799 ilink1 = iwl_read_targ_mem(priv, base + 5 * sizeof(u32));
4800 ilink2 = iwl_read_restricted_mem(priv, base + 6 * sizeof(u32)); 4800 ilink2 = iwl_read_targ_mem(priv, base + 6 * sizeof(u32));
4801 data1 = iwl_read_restricted_mem(priv, base + 7 * sizeof(u32)); 4801 data1 = iwl_read_targ_mem(priv, base + 7 * sizeof(u32));
4802 data2 = iwl_read_restricted_mem(priv, base + 8 * sizeof(u32)); 4802 data2 = iwl_read_targ_mem(priv, base + 8 * sizeof(u32));
4803 line = iwl_read_restricted_mem(priv, base + 9 * sizeof(u32)); 4803 line = iwl_read_targ_mem(priv, base + 9 * sizeof(u32));
4804 time = iwl_read_restricted_mem(priv, base + 11 * sizeof(u32)); 4804 time = iwl_read_targ_mem(priv, base + 11 * sizeof(u32));
4805 4805
4806 IWL_ERROR("Desc Time " 4806 IWL_ERROR("Desc Time "
4807 "data1 data2 line\n"); 4807 "data1 data2 line\n");
@@ -4845,14 +4845,14 @@ static void iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,
4845 /* "time" is actually "data" for mode 0 (no timestamp). 4845 /* "time" is actually "data" for mode 0 (no timestamp).
4846 * place event id # at far right for easier visual parsing. */ 4846 * place event id # at far right for easier visual parsing. */
4847 for (i = 0; i < num_events; i++) { 4847 for (i = 0; i < num_events; i++) {
4848 ev = iwl_read_restricted_mem(priv, ptr); 4848 ev = iwl_read_targ_mem(priv, ptr);
4849 ptr += sizeof(u32); 4849 ptr += sizeof(u32);
4850 time = iwl_read_restricted_mem(priv, ptr); 4850 time = iwl_read_targ_mem(priv, ptr);
4851 ptr += sizeof(u32); 4851 ptr += sizeof(u32);
4852 if (mode == 0) 4852 if (mode == 0)
4853 IWL_ERROR("0x%08x\t%04u\n", time, ev); /* data, ev */ 4853 IWL_ERROR("0x%08x\t%04u\n", time, ev); /* data, ev */
4854 else { 4854 else {
4855 data = iwl_read_restricted_mem(priv, ptr); 4855 data = iwl_read_targ_mem(priv, ptr);
4856 ptr += sizeof(u32); 4856 ptr += sizeof(u32);
4857 IWL_ERROR("%010u\t0x%08x\t%04u\n", time, data, ev); 4857 IWL_ERROR("%010u\t0x%08x\t%04u\n", time, data, ev);
4858 } 4858 }
@@ -4882,10 +4882,10 @@ static void iwl_dump_nic_event_log(struct iwl_priv *priv)
4882 } 4882 }
4883 4883
4884 /* event log header */ 4884 /* event log header */
4885 capacity = iwl_read_restricted_mem(priv, base); 4885 capacity = iwl_read_targ_mem(priv, base);
4886 mode = iwl_read_restricted_mem(priv, base + (1 * sizeof(u32))); 4886 mode = iwl_read_targ_mem(priv, base + (1 * sizeof(u32)));
4887 num_wraps = iwl_read_restricted_mem(priv, base + (2 * sizeof(u32))); 4887 num_wraps = iwl_read_targ_mem(priv, base + (2 * sizeof(u32)));
4888 next_entry = iwl_read_restricted_mem(priv, base + (3 * sizeof(u32))); 4888 next_entry = iwl_read_targ_mem(priv, base + (3 * sizeof(u32)));
4889 4889
4890 size = num_wraps ? capacity : next_entry; 4890 size = num_wraps ? capacity : next_entry;
4891 4891