openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

wl1271: read fem manufacturer value from nvs 

We should read the fem manufacturer value from the NVS, so we can modify it
easily and use a consistent value throughout the configuration.  Previously
we had to set the FEM value in the NVS and in the driver's initialization
parameters.  This patch removes the latter.

Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luciano Coelho 2010-07-08 17:50:01 +03:00 committed by John W. Linville
parent 90494a90be
commit e6b190ff3c
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/wl12xx/wl1271_cmd.c
View File

@ -132,7 +132,7 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
int wl1271_cmd_radio_parms(struct wl1271 *wl) int wl1271_cmd_radio_parms(struct wl1271 *wl)
{ {
struct wl1271_radio_parms_cmd *radio_parms; struct wl1271_radio_parms_cmd *radio_parms;
struct conf_radio_parms *rparam = &wl->conf.init.radioparam; struct wl1271_ini_general_params *gp = &wl->nvs->general_params;
int ret; int ret;
if (!wl->nvs) if (!wl->nvs)
@ -148,7 +148,7 @@ int wl1271_cmd_radio_parms(struct wl1271 *wl)
memcpy(&radio_parms->static_params_2, &wl->nvs->stat_radio_params_2, memcpy(&radio_parms->static_params_2, &wl->nvs->stat_radio_params_2,
sizeof(struct wl1271_ini_band_params_2)); sizeof(struct wl1271_ini_band_params_2));
memcpy(&radio_parms->dyn_params_2, memcpy(&radio_parms->dyn_params_2,
&wl->nvs->dyn_radio_params_2[rparam->fem].params, &wl->nvs->dyn_radio_params_2[gp->tx_bip_fem_manufacturer].params,
sizeof(struct wl1271_ini_fem_params_2)); sizeof(struct wl1271_ini_fem_params_2));
/* 5GHz parameters */ /* 5GHz parameters */
@ -156,7 +156,7 @@ int wl1271_cmd_radio_parms(struct wl1271 *wl)
&wl->nvs->stat_radio_params_5, &wl->nvs->stat_radio_params_5,
sizeof(struct wl1271_ini_band_params_5)); sizeof(struct wl1271_ini_band_params_5));
memcpy(&radio_parms->dyn_params_5, memcpy(&radio_parms->dyn_params_5,
&wl->nvs->dyn_radio_params_5[rparam->fem].params, &wl->nvs->dyn_radio_params_5[gp->tx_bip_fem_manufacturer].params,
sizeof(struct wl1271_ini_fem_params_5)); sizeof(struct wl1271_ini_fem_params_5));
wl1271_dump(DEBUG_CMD, "TEST_CMD_INI_FILE_RADIO_PARAM: ", wl1271_dump(DEBUG_CMD, "TEST_CMD_INI_FILE_RADIO_PARAM: ",

9
drivers/net/wireless/wl12xx/wl1271_conf.h
View File

@ -955,14 +955,6 @@ struct conf_radio_parms {
u8 fem; u8 fem;
}; };
struct conf_init_settings {
/*
* Configure radio parameters.
*/
struct conf_radio_parms radioparam;
};
struct conf_itrim_settings { struct conf_itrim_settings {
/* enable dco itrim */ /* enable dco itrim */
u8 enable; u8 enable;
@ -1029,7 +1021,6 @@ struct conf_drv_settings {
struct conf_rx_settings rx; struct conf_rx_settings rx;
struct conf_tx_settings tx; struct conf_tx_settings tx;
struct conf_conn_settings conn; struct conf_conn_settings conn;
struct conf_init_settings init;
struct conf_itrim_settings itrim; struct conf_itrim_settings itrim;
struct conf_pm_config_settings pm_config; struct conf_pm_config_settings pm_config;
struct conf_roam_trigger_settings roam_trigger; struct conf_roam_trigger_settings roam_trigger;

5
drivers/net/wireless/wl12xx/wl1271_main.c
View File

@ -241,11 +241,6 @@ static struct conf_drv_settings default_conf = {
.keep_alive_interval = 55000, .keep_alive_interval = 55000,
.max_listen_interval = 20, .max_listen_interval = 20,
}, },
.init = {
.radioparam = {
.fem = 1,
}
},
.itrim = { .itrim = {
.enable = false, .enable = false,
.timeout = 50000, .timeout = 50000,