iwlagn: introduce silent grabbing of NIC access

[deliverable/linux.git] / drivers / net / wireless / iwlwifi / iwl-io.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h
index ab632baf49d51d9347f963558dc22bb8ef4d1800..869edc580ec6c461ae0f01da7b968a0de5af868e 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-io.h
+++ b/drivers/net/wireless/iwlwifi/iwl-io.h
@@ -62,6 +62,7 @@ int iwl_poll_bit(struct iwl_priv *priv, u32 addr,
 int iwl_poll_direct_bit(struct iwl_priv *priv, u32 addr, u32 mask,
                        int timeout);
 
+int iwl_grab_nic_access_silent(struct iwl_priv *priv);
 int iwl_grab_nic_access(struct iwl_priv *priv);
 void iwl_release_nic_access(struct iwl_priv *priv);
 
@@ -76,6 +77,16 @@ void iwl_set_bits_mask_prph(struct iwl_priv *priv, u32 reg,
                            u32 bits, u32 mask);
 void iwl_clear_bits_prph(struct iwl_priv *priv, u32 reg, u32 mask);
 
+void _iwl_read_targ_mem_words(struct iwl_priv *priv, u32 addr,
+                             void *buf, int words);
+
+#define iwl_read_targ_mem_words(priv, addr, buf, bufsize)      \
+       do {                                                    \
+               BUILD_BUG_ON((bufsize) % sizeof(u32));          \
+               _iwl_read_targ_mem_words(priv, addr, buf,       \
+                                        (bufsize) / sizeof(u32));\
+       } while (0)
+
 u32 iwl_read_targ_mem(struct iwl_priv *priv, u32 addr);
 void iwl_write_targ_mem(struct iwl_priv *priv, u32 addr, u32 val);
 #endif