diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-05-21 05:55:54 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-06-06 07:24:19 -0400 |
commit | 26a7ca9a71a3f7e1826de96b1a1e907123e11b07 (patch) | |
tree | 7ab52c58fdd876bacf112c1bfceeac865f196704 /drivers/net/wireless/iwlwifi/dvm/agn.h | |
parent | 08838cdeca65e754af5c755a05f6cdb1c632eda8 (diff) |
iwlwifi: refactor EEPROM reading/parsing
The EEPROM reading/parsing code is all mixed in
the driver today, and the EEPROM is parsed only
when we access data from it. This is problematic
because the NVM needs to be parsed and that is
independent of reading it. Also, the NVM format
for new devices will be different and probably
require a new parser.
Therefore refactor the reading and parsing and
create two independent components. Reading the
EEPROM requires direct hardware accesses and
therefore access to the transport, but parsing
is independent and can be done on an NVM blob.
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/agn.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/agn.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/agn.h b/drivers/net/wireless/iwlwifi/dvm/agn.h index 9a8dd1a579d0..2ae3608472a6 100644 --- a/drivers/net/wireless/iwlwifi/dvm/agn.h +++ b/drivers/net/wireless/iwlwifi/dvm/agn.h | |||
@@ -92,7 +92,6 @@ extern struct iwl_lib_ops iwl6030_lib; | |||
92 | #define STATUS_CT_KILL 1 | 92 | #define STATUS_CT_KILL 1 |
93 | #define STATUS_ALIVE 2 | 93 | #define STATUS_ALIVE 2 |
94 | #define STATUS_READY 3 | 94 | #define STATUS_READY 3 |
95 | #define STATUS_GEO_CONFIGURED 4 | ||
96 | #define STATUS_EXIT_PENDING 5 | 95 | #define STATUS_EXIT_PENDING 5 |
97 | #define STATUS_STATISTICS 6 | 96 | #define STATUS_STATISTICS 6 |
98 | #define STATUS_SCANNING 7 | 97 | #define STATUS_SCANNING 7 |
@@ -443,10 +442,8 @@ static inline void iwl_print_rx_config_cmd(struct iwl_priv *priv, | |||
443 | 442 | ||
444 | static inline int iwl_is_ready(struct iwl_priv *priv) | 443 | static inline int iwl_is_ready(struct iwl_priv *priv) |
445 | { | 444 | { |
446 | /* The adapter is 'ready' if READY and GEO_CONFIGURED bits are | 445 | /* The adapter is 'ready' if READY EXIT_PENDING is not set */ |
447 | * set but EXIT_PENDING is not */ | ||
448 | return test_bit(STATUS_READY, &priv->status) && | 446 | return test_bit(STATUS_READY, &priv->status) && |
449 | test_bit(STATUS_GEO_CONFIGURED, &priv->status) && | ||
450 | !test_bit(STATUS_EXIT_PENDING, &priv->status); | 447 | !test_bit(STATUS_EXIT_PENDING, &priv->status); |
451 | } | 448 | } |
452 | 449 | ||