Skip to content

L
linux
Commit e04ed0a5 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by Reinette Chatre
Browse files
Options

iwlwifi: move agn common code to iwlagn library file 

Multiple iwlagn based devices share the same common functions.
Move those functions from iwl-5000.c to iwl-agn-lib.c file.
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 741a6266
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 464 additions and 416 deletions
drivers/net/wireless/iwlwifi/Makefile
View file @ e04ed0a5
...@@ -11,6 +11,7 @@ CFLAGS_iwl-devtrace.o := -I$(src) ...@@ -11,6 +11,7 @@ CFLAGS_iwl-devtrace.o := -I$(src)
obj-$(CONFIG_IWLAGN) += iwlagn.o obj-$(CONFIG_IWLAGN) += iwlagn.o
iwlagn-objs := iwl-agn.o iwl-agn-rs.o iwl-agn-led.o iwl-agn-ict.o iwlagn-objs := iwl-agn.o iwl-agn-rs.o iwl-agn-led.o iwl-agn-ict.o
iwlagn-objs += iwl-agn-ucode.o iwl-agn-hcmd.o iwl-agn-tx.o iwlagn-objs += iwl-agn-ucode.o iwl-agn-hcmd.o iwl-agn-tx.o
iwlagn-objs += iwl-agn-lib.o
iwlagn-$(CONFIG_IWL4965) += iwl-4965.o iwlagn-$(CONFIG_IWL4965) += iwl-4965.o
iwlagn-$(CONFIG_IWL5000) += iwl-5000.o iwlagn-$(CONFIG_IWL5000) += iwl-5000.o
......
drivers/net/wireless/iwlwifi/iwl-1000.c
View file @ e04ed0a5
...@@ -170,9 +170,9 @@ static struct iwl_lib_ops iwl1000_lib = { ...@@ -170,9 +170,9 @@ static struct iwl_lib_ops iwl1000_lib = {
.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd, .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
.txq_free_tfd = iwl_hw_txq_free_tfd, .txq_free_tfd = iwl_hw_txq_free_tfd,
.txq_init = iwl_hw_tx_queue_init, .txq_init = iwl_hw_tx_queue_init,
.rx_handler_setup = iwl5000_rx_handler_setup, .rx_handler_setup = iwlagn_rx_handler_setup,
.setup_deferred_work = iwl5000_setup_deferred_work, .setup_deferred_work = iwlagn_setup_deferred_work,
.is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr, .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,
.load_ucode = iwlagn_load_ucode, .load_ucode = iwlagn_load_ucode,
.dump_nic_event_log = iwl_dump_nic_event_log, .dump_nic_event_log = iwl_dump_nic_event_log,
.dump_nic_error_log = iwl_dump_nic_error_log, .dump_nic_error_log = iwl_dump_nic_error_log,
...@@ -180,7 +180,7 @@ static struct iwl_lib_ops iwl1000_lib = { ...@@ -180,7 +180,7 @@ static struct iwl_lib_ops iwl1000_lib = {
.dump_fh = iwl_dump_fh, .dump_fh = iwl_dump_fh,
.init_alive_start = iwlagn_init_alive_start, .init_alive_start = iwlagn_init_alive_start,
.alive_notify = iwlagn_alive_notify, .alive_notify = iwlagn_alive_notify,
.send_tx_power = iwl5000_send_tx_power, .send_tx_power = iwlagn_send_tx_power,
.update_chain_flags = iwl_update_chain_flags, .update_chain_flags = iwl_update_chain_flags,
.apm_ops = { .apm_ops = {
.init = iwl_apm_init, .init = iwl_apm_init,
...@@ -190,25 +190,25 @@ static struct iwl_lib_ops iwl1000_lib = { ...@@ -190,25 +190,25 @@ static struct iwl_lib_ops iwl1000_lib = {
}, },
.eeprom_ops = { .eeprom_ops = {
.regulatory_bands = { .regulatory_bands = {
EEPROM_5000_REG_BAND_1_CHANNELS, EEPROM_REG_BAND_1_CHANNELS,
EEPROM_5000_REG_BAND_2_CHANNELS, EEPROM_REG_BAND_2_CHANNELS,
EEPROM_5000_REG_BAND_3_CHANNELS, EEPROM_REG_BAND_3_CHANNELS,
EEPROM_5000_REG_BAND_4_CHANNELS, EEPROM_REG_BAND_4_CHANNELS,
EEPROM_5000_REG_BAND_5_CHANNELS, EEPROM_REG_BAND_5_CHANNELS,
EEPROM_5000_REG_BAND_24_HT40_CHANNELS, EEPROM_REG_BAND_24_HT40_CHANNELS,
EEPROM_5000_REG_BAND_52_HT40_CHANNELS EEPROM_REG_BAND_52_HT40_CHANNELS
}, },
.verify_signature = iwlcore_eeprom_verify_signature, .verify_signature = iwlcore_eeprom_verify_signature,
.acquire_semaphore = iwlcore_eeprom_acquire_semaphore, .acquire_semaphore = iwlcore_eeprom_acquire_semaphore,
.release_semaphore = iwlcore_eeprom_release_semaphore, .release_semaphore = iwlcore_eeprom_release_semaphore,
.calib_version = iwl5000_eeprom_calib_version, .calib_version = iwlagn_eeprom_calib_version,
.query_addr = iwl5000_eeprom_query_addr, .query_addr = iwlagn_eeprom_query_addr,
}, },
.post_associate = iwl_post_associate, .post_associate = iwl_post_associate,
.isr = iwl_isr_ict, .isr = iwl_isr_ict,
.config_ap = iwl_config_ap, .config_ap = iwl_config_ap,
.temp_ops = { .temp_ops = {
.temperature = iwl5000_temperature, .temperature = iwlagn_temperature,
.set_ct_kill = iwl1000_set_ct_threshold, .set_ct_kill = iwl1000_set_ct_threshold,
}, },
.add_bcast_station = iwl_add_bcast_station, .add_bcast_station = iwl_add_bcast_station,
......
drivers/net/wireless/iwlwifi/iwl-5000.c
View file @ e04ed0a5
This diff is collapsed.
drivers/net/wireless/iwlwifi/iwl-6000.c
View file @ e04ed0a5
...@@ -234,9 +234,9 @@ static struct iwl_lib_ops iwl6000_lib = { ...@@ -234,9 +234,9 @@ static struct iwl_lib_ops iwl6000_lib = {
.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd, .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
.txq_free_tfd = iwl_hw_txq_free_tfd, .txq_free_tfd = iwl_hw_txq_free_tfd,
.txq_init = iwl_hw_tx_queue_init, .txq_init = iwl_hw_tx_queue_init,
.rx_handler_setup = iwl5000_rx_handler_setup, .rx_handler_setup = iwlagn_rx_handler_setup,
.setup_deferred_work = iwl5000_setup_deferred_work, .setup_deferred_work = iwlagn_setup_deferred_work,
.is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr, .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,
.load_ucode = iwlagn_load_ucode, .load_ucode = iwlagn_load_ucode,
.dump_nic_event_log = iwl_dump_nic_event_log, .dump_nic_event_log = iwl_dump_nic_event_log,
.dump_nic_error_log = iwl_dump_nic_error_log, .dump_nic_error_log = iwl_dump_nic_error_log,
...@@ -244,7 +244,7 @@ static struct iwl_lib_ops iwl6000_lib = { ...@@ -244,7 +244,7 @@ static struct iwl_lib_ops iwl6000_lib = {
.dump_fh = iwl_dump_fh, .dump_fh = iwl_dump_fh,
.init_alive_start = iwlagn_init_alive_start, .init_alive_start = iwlagn_init_alive_start,
.alive_notify = iwlagn_alive_notify, .alive_notify = iwlagn_alive_notify,
.send_tx_power = iwl5000_send_tx_power, .send_tx_power = iwlagn_send_tx_power,
.update_chain_flags = iwl_update_chain_flags, .update_chain_flags = iwl_update_chain_flags,
.set_channel_switch = iwl6000_hw_channel_switch, .set_channel_switch = iwl6000_hw_channel_switch,
.apm_ops = { .apm_ops = {
...@@ -255,26 +255,26 @@ static struct iwl_lib_ops iwl6000_lib = { ...@@ -255,26 +255,26 @@ static struct iwl_lib_ops iwl6000_lib = {
}, },
.eeprom_ops = { .eeprom_ops = {
.regulatory_bands = { .regulatory_bands = {
EEPROM_5000_REG_BAND_1_CHANNELS, EEPROM_REG_BAND_1_CHANNELS,
EEPROM_5000_REG_BAND_2_CHANNELS, EEPROM_REG_BAND_2_CHANNELS,
EEPROM_5000_REG_BAND_3_CHANNELS, EEPROM_REG_BAND_3_CHANNELS,
EEPROM_5000_REG_BAND_4_CHANNELS, EEPROM_REG_BAND_4_CHANNELS,
EEPROM_5000_REG_BAND_5_CHANNELS, EEPROM_REG_BAND_5_CHANNELS,
EEPROM_5000_REG_BAND_24_HT40_CHANNELS, EEPROM_REG_BAND_24_HT40_CHANNELS,
EEPROM_5000_REG_BAND_52_HT40_CHANNELS EEPROM_REG_BAND_52_HT40_CHANNELS
}, },
.verify_signature = iwlcore_eeprom_verify_signature, .verify_signature = iwlcore_eeprom_verify_signature,
.acquire_semaphore = iwlcore_eeprom_acquire_semaphore, .acquire_semaphore = iwlcore_eeprom_acquire_semaphore,
.release_semaphore = iwlcore_eeprom_release_semaphore, .release_semaphore = iwlcore_eeprom_release_semaphore,
.calib_version = iwl5000_eeprom_calib_version, .calib_version = iwlagn_eeprom_calib_version,
.query_addr = iwl5000_eeprom_query_addr, .query_addr = iwlagn_eeprom_query_addr,
.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower, .update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,
}, },
.post_associate = iwl_post_associate, .post_associate = iwl_post_associate,
.isr = iwl_isr_ict, .isr = iwl_isr_ict,
.config_ap = iwl_config_ap, .config_ap = iwl_config_ap,
.temp_ops = { .temp_ops = {
.temperature = iwl5000_temperature, .temperature = iwlagn_temperature,
.set_ct_kill = iwl6000_set_ct_threshold, .set_ct_kill = iwl6000_set_ct_threshold,
}, },
.add_bcast_station = iwl_add_bcast_station, .add_bcast_station = iwl_add_bcast_station,
...@@ -301,9 +301,9 @@ static struct iwl_lib_ops iwl6050_lib = { ...@@ -301,9 +301,9 @@ static struct iwl_lib_ops iwl6050_lib = {
.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd, .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
.txq_free_tfd = iwl_hw_txq_free_tfd, .txq_free_tfd = iwl_hw_txq_free_tfd,
.txq_init = iwl_hw_tx_queue_init, .txq_init = iwl_hw_tx_queue_init,
.rx_handler_setup = iwl5000_rx_handler_setup, .rx_handler_setup = iwlagn_rx_handler_setup,
.setup_deferred_work = iwl5000_setup_deferred_work, .setup_deferred_work = iwlagn_setup_deferred_work,
.is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr, .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,
.load_ucode = iwlagn_load_ucode, .load_ucode = iwlagn_load_ucode,
.dump_nic_event_log = iwl_dump_nic_event_log, .dump_nic_event_log = iwl_dump_nic_event_log,
.dump_nic_error_log = iwl_dump_nic_error_log, .dump_nic_error_log = iwl_dump_nic_error_log,
...@@ -311,7 +311,7 @@ static struct iwl_lib_ops iwl6050_lib = { ...@@ -311,7 +311,7 @@ static struct iwl_lib_ops iwl6050_lib = {
.dump_fh = iwl_dump_fh, .dump_fh = iwl_dump_fh,
.init_alive_start = iwlagn_init_alive_start, .init_alive_start = iwlagn_init_alive_start,
.alive_notify = iwlagn_alive_notify, .alive_notify = iwlagn_alive_notify,
.send_tx_power = iwl5000_send_tx_power, .send_tx_power = iwlagn_send_tx_power,
.update_chain_flags = iwl_update_chain_flags, .update_chain_flags = iwl_update_chain_flags,
.set_channel_switch = iwl6000_hw_channel_switch, .set_channel_switch = iwl6000_hw_channel_switch,
.apm_ops = { .apm_ops = {
...@@ -322,26 +322,26 @@ static struct iwl_lib_ops iwl6050_lib = { ...@@ -322,26 +322,26 @@ static struct iwl_lib_ops iwl6050_lib = {
}, },
.eeprom_ops = { .eeprom_ops = {
.regulatory_bands = { .regulatory_bands = {
EEPROM_5000_REG_BAND_1_CHANNELS, EEPROM_REG_BAND_1_CHANNELS,
EEPROM_5000_REG_BAND_2_CHANNELS, EEPROM_REG_BAND_2_CHANNELS,
EEPROM_5000_REG_BAND_3_CHANNELS, EEPROM_REG_BAND_3_CHANNELS,
EEPROM_5000_REG_BAND_4_CHANNELS, EEPROM_REG_BAND_4_CHANNELS,
EEPROM_5000_REG_BAND_5_CHANNELS, EEPROM_REG_BAND_5_CHANNELS,
EEPROM_5000_REG_BAND_24_HT40_CHANNELS, EEPROM_REG_BAND_24_HT40_CHANNELS,
EEPROM_5000_REG_BAND_52_HT40_CHANNELS EEPROM_REG_BAND_52_HT40_CHANNELS
}, },
.verify_signature = iwlcore_eeprom_verify_signature, .verify_signature = iwlcore_eeprom_verify_signature,
.acquire_semaphore = iwlcore_eeprom_acquire_semaphore, .acquire_semaphore = iwlcore_eeprom_acquire_semaphore,
.release_semaphore = iwlcore_eeprom_release_semaphore, .release_semaphore = iwlcore_eeprom_release_semaphore,
.calib_version = iwl5000_eeprom_calib_version, .calib_version = iwlagn_eeprom_calib_version,
.query_addr = iwl5000_eeprom_query_addr, .query_addr = iwlagn_eeprom_query_addr,
.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower, .update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,
}, },
.post_associate = iwl_post_associate, .post_associate = iwl_post_associate,
.isr = iwl_isr_ict, .isr = iwl_isr_ict,
.config_ap = iwl_config_ap, .config_ap = iwl_config_ap,
.temp_ops = { .temp_ops = {
.temperature = iwl5000_temperature, .temperature = iwlagn_temperature,
.set_ct_kill = iwl6000_set_ct_threshold, .set_ct_kill = iwl6000_set_ct_threshold,
.set_calib_version = iwl6050_set_calib_version, .set_calib_version = iwl6050_set_calib_version,
}, },
......
drivers/net/wireless/iwlwifi/iwl-agn-lib.c 0 → 100644
View file @ e04ed0a5
This diff is collapsed.
drivers/net/wireless/iwlwifi/iwl-agn.h
View file @ e04ed0a5
...@@ -103,4 +103,14 @@ void iwlagn_rx_calib_complete(struct iwl_priv *priv, ...@@ -103,4 +103,14 @@ void iwlagn_rx_calib_complete(struct iwl_priv *priv,
void iwlagn_init_alive_start(struct iwl_priv *priv); void iwlagn_init_alive_start(struct iwl_priv *priv);
int iwlagn_alive_notify(struct iwl_priv *priv); int iwlagn_alive_notify(struct iwl_priv *priv);
/* lib */
void iwlagn_rx_handler_setup(struct iwl_priv *priv);
void iwlagn_setup_deferred_work(struct iwl_priv *priv);
int iwlagn_hw_valid_rtc_data_addr(u32 addr);
int iwlagn_send_tx_power(struct iwl_priv *priv);
void iwlagn_temperature(struct iwl_priv *priv);
u16 iwlagn_eeprom_calib_version(struct iwl_priv *priv);
const u8 *iwlagn_eeprom_query_addr(const struct iwl_priv *priv,
size_t offset);
#endif /* __iwl_agn_h__ */ #endif /* __iwl_agn_h__ */
drivers/net/wireless/iwlwifi/iwl-eeprom.h
View file @ e04ed0a5
...@@ -188,19 +188,19 @@ struct iwl_eeprom_enhanced_txpwr { ...@@ -188,19 +188,19 @@ struct iwl_eeprom_enhanced_txpwr {
/* 5000 regulatory - indirect access */ /* 5000 regulatory - indirect access */
#define EEPROM_5000_REG_SKU_ID ((0x02)\ #define EEPROM_5000_REG_SKU_ID ((0x02)\
| INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 4 bytes */ | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 4 bytes */
#define EEPROM_5000_REG_BAND_1_CHANNELS ((0x08)\ #define EEPROM_REG_BAND_1_CHANNELS ((0x08)\
| INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 28 bytes */ | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 28 bytes */
#define EEPROM_5000_REG_BAND_2_CHANNELS ((0x26)\ #define EEPROM_REG_BAND_2_CHANNELS ((0x26)\
| INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 26 bytes */ | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 26 bytes */
#define EEPROM_5000_REG_BAND_3_CHANNELS ((0x42)\ #define EEPROM_REG_BAND_3_CHANNELS ((0x42)\
| INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 24 bytes */ | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 24 bytes */
#define EEPROM_5000_REG_BAND_4_CHANNELS ((0x5C)\ #define EEPROM_REG_BAND_4_CHANNELS ((0x5C)\
| INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 22 bytes */ | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 22 bytes */
#define EEPROM_5000_REG_BAND_5_CHANNELS ((0x74)\ #define EEPROM_REG_BAND_5_CHANNELS ((0x74)\
| INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 12 bytes */ | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 12 bytes */
#define EEPROM_5000_REG_BAND_24_HT40_CHANNELS ((0x82)\ #define EEPROM_REG_BAND_24_HT40_CHANNELS ((0x82)\
| INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 14 bytes */ | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 14 bytes */
#define EEPROM_5000_REG_BAND_52_HT40_CHANNELS ((0x92)\ #define EEPROM_REG_BAND_52_HT40_CHANNELS ((0x92)\
| INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 22 bytes */ | INDIRECT_ADDRESS | INDIRECT_REGULATORY) /* 22 bytes */
/* 6000 and up regulatory tx power - indirect access */ /* 6000 and up regulatory tx power - indirect access */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7