diff options
| author | Ilan Peer <ilan.peer@intel.com> | 2012-06-03 13:36:51 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-06-11 11:37:21 +0200 |
| commit | 3a6490c0840c0ae67cc3a51e1b724bd7e460041e (patch) | |
| tree | a4ca0fb263015d883fdc6f681442df5a9c4d60d8 /drivers/net/wireless/iwlwifi/dvm/dev.h | |
| parent | b1abedada3fd0aa100723aa9b60b7e31c17945cb (diff) | |
| download | kernel_goldelico_gta04-3a6490c0840c0ae67cc3a51e1b724bd7e460041e.zip kernel_goldelico_gta04-3a6490c0840c0ae67cc3a51e1b724bd7e460041e.tar.gz kernel_goldelico_gta04-3a6490c0840c0ae67cc3a51e1b724bd7e460041e.tar.bz2 | |
iwlwifi: refactor testmode
Create an object that will enacpsulate the testmode functionality
that is common to all op modes.
* Copy definitions from dvm/dev.h
* Copy the testmode logic from dvm/testmode.c
* Link iwl-test object into the iwlwifi module
* Modify DVM to use iwl-test object
Reviewed-by: Amit Beka <amit.beka@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/dev.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/dev.h | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/dev.h b/drivers/net/wireless/iwlwifi/dvm/dev.h index 89f2e10..4620b65 100644 --- a/drivers/net/wireless/iwlwifi/dvm/dev.h +++ b/drivers/net/wireless/iwlwifi/dvm/dev.h @@ -52,6 +52,8 @@ #include "rs.h" #include "tt.h" +#include "iwl-test.h" + /* CT-KILL constants */ #define CT_KILL_THRESHOLD_LEGACY 110 /* in Celsius */ #define CT_KILL_THRESHOLD 114 /* in Celsius */ @@ -596,24 +598,6 @@ struct iwl_lib_ops { void (*temperature)(struct iwl_priv *priv); }; -#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE -struct iwl_testmode_trace { - u32 buff_size; - u32 total_size; - u32 num_chunks; - u8 *cpu_addr; - u8 *trace_addr; - dma_addr_t dma_addr; - bool trace_enabled; -}; -struct iwl_testmode_mem { - u32 buff_size; - u32 num_chunks; - u8 *buff_addr; - bool read_in_progress; -}; -#endif - struct iwl_wipan_noa_data { struct rcu_head rcu_head; u32 length; @@ -670,8 +654,6 @@ struct iwl_priv { enum ieee80211_band band; u8 valid_contexts; - void (*pre_rx_handler)(struct iwl_priv *priv, - struct iwl_rx_cmd_buffer *rxb); int (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb, struct iwl_device_cmd *cmd); @@ -895,9 +877,9 @@ struct iwl_priv { struct led_classdev led; unsigned long blink_on, blink_off; bool led_registered; + #ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE - struct iwl_testmode_trace testmode_trace; - struct iwl_testmode_mem testmode_mem; + struct iwl_test tst; u32 tm_fixed_rate; #endif |