Skip to content

Fixes to make autocalibrate work on linux 3.14.52 armv7l #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tom-van wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes to make autocalibrate work on linux 3.14.52 armv7l #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66d75b8
Command handler plt_tx_bip() stored nvs_path on stack and send
tom-van Apr 24, 2016
9581772
Delay of 1.5 sec added after insmod() call in plt_autocalibrate()
tom-van Apr 24, 2016
4add29f
Maximal size of nvs file is sometimes given by number and sometimes
tom-van Apr 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions nvs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ int prepare_nvs_file(void *arg, char *file_name)
unsigned char mac_addr[MAC_ADDR_LEN];
struct wl1271_cmd_cal_p2g *pdata;
struct wl1271_cmd_cal_p2g old_data[eNUMBER_RADIO_TYPE_PARAMETERS_INFO];
char buf[2048];
char buf[BUF_SIZE_4_NVS_FILE];
unsigned char *p;
struct wl12xx_common cmn = {
.arch = UNKNOWN_ARCH,
Expand Down Expand Up @@ -694,7 +694,7 @@ int prepare_nvs_file(void *arg, char *file_name)
int create_nvs_file(struct wl12xx_common *cmn)
{
int new_nvs, res = 0;
char buf[2048];
char buf[BUF_SIZE_4_NVS_FILE];

/* create new NVS file */
new_nvs = open(cmn->nvs_name,
Expand Down Expand Up @@ -727,7 +727,7 @@ int create_nvs_file(struct wl12xx_common *cmn)
int update_nvs_file(const char *nvs_infile, const char *nvs_outfile, struct wl12xx_common *cmn)
{
int new_nvs, res = 0;
char buf[2048];
char buf[BUF_SIZE_4_NVS_FILE];

res = read_nvs(nvs_infile, buf, BUF_SIZE_4_NVS_FILE, NULL);
if (res)
Expand Down Expand Up @@ -764,7 +764,7 @@ int update_nvs_file(const char *nvs_infile, const char *nvs_outfile, struct wl12
int dump_nvs_file(const char *nvs_file)
{
int sz=0, size;
char buf[2048];
char buf[BUF_SIZE_4_NVS_FILE];
unsigned char *p = (unsigned char *)buf;

if (read_nvs(nvs_file, buf, BUF_SIZE_4_NVS_FILE, &size))
Expand All @@ -786,7 +786,7 @@ int set_nvs_file_autofem(const char *nvs_file, unsigned char val,
struct wl12xx_common *cmn)
{
int new_nvs, res = 0;
char buf[2048];
char buf[BUF_SIZE_4_NVS_FILE];
int nvs_file_sz;

res = read_nvs(nvs_file, buf, BUF_SIZE_4_NVS_FILE, &nvs_file_sz);
Expand Down Expand Up @@ -832,7 +832,7 @@ int set_nvs_file_fem_manuf(const char *nvs_file, unsigned char val,
struct wl12xx_common *cmn)
{
int new_nvs, res = 0;
char buf[2048];
char buf[BUF_SIZE_4_NVS_FILE];
int nvs_file_sz;

res = read_nvs(nvs_file, buf, BUF_SIZE_4_NVS_FILE, &nvs_file_sz);
Expand Down
8 changes: 5 additions & 3 deletions plt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,17 +437,17 @@ static int plt_tx_bip(struct nl80211_state *state, struct nl_cb *cb,
struct nlattr *key;
struct wl1271_cmd_cal_p2g prms;
int i;
char nvs_path[PATH_MAX];
char *nvs_path;

if (argc < 8) {
fprintf(stderr, "%s> Missing arguments\n", __func__);
return 2;
}

if (argc > 8)
strncpy(nvs_path, argv[8], strlen(argv[8]));
nvs_path= argv[8];
else
nvs_path[0] = '\0';
nvs_path= NEW_NVS_NAME;

memset(&prms, 0, sizeof(struct wl1271_cmd_cal_p2g));

Expand Down Expand Up @@ -1091,6 +1091,8 @@ static int plt_autocalibrate(struct nl80211_state *state, struct nl_cb *cb,
goto out_removenvs;
}

usleep(1500000);

res = plt_do_power_on(state, devname);
if (res < 0)
goto out_rmmod;
Expand Down