Skip to content

Commit 6071534

Browse files
fix(scan_timeout): increase timeout if doing blocking scan
- increase default timeout if use requests to block while doing scan, which may take a longer time
1 parent 9f32a93 commit 6071534

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

host/drivers/rpc/slaveif/rpc_slave_if.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ extern "C" {
4646
* */
4747
//#define WAIT_TIME_B2B_RPC_REQ 5
4848
#define DEFAULT_RPC_RSP_TIMEOUT 5
49-
49+
#define DEFAULT_RPC_RSP_SCAN_TIMEOUT 30
5050

5151
#define SUCCESS_STR "success"
5252
#define FAILURE_STR "failure"

host/drivers/rpc/wrap/rpc_wrap.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static ctrl_cmd_t * RPC_DEFAULT_REQ(void)
5353
assert(new_req);
5454
new_req->msg_type = RPC_TYPE__Req;
5555
new_req->rpc_rsp_cb = NULL;
56-
new_req->rsp_timeout_sec = DEFAULT_RPC_RSP_TIMEOUT; /* 5 sec */
56+
new_req->rsp_timeout_sec = DEFAULT_RPC_RSP_TIMEOUT;
5757
/* new_req->wait_prev_cmd_completion = WAIT_TIME_B2B_RPC_REQ; */
5858
return new_req;
5959
}
@@ -955,7 +955,10 @@ int rpc_wifi_scan_start(const wifi_scan_config_t *config, bool block)
955955
}
956956

957957
req->u.wifi_scan_config.block = block;
958-
958+
if (req->u.wifi_scan_config.block) {
959+
// blocking while doing scan may take a long time: increase timeout value
960+
req->rsp_timeout_sec = DEFAULT_RPC_RSP_SCAN_TIMEOUT;
961+
}
959962
resp = rpc_slaveif_wifi_scan_start(req);
960963

961964
return rpc_rsp_callback(resp);

0 commit comments

Comments
 (0)