michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: modem: sara-r4: Add direct CMD to catch @ when sending data

Browse source 
Replace hard coded wait by real detection of '@'.
This make sure that datasheet timings are correctly followed.

Signed-off-by: Xavier Chapron <xavier.chapron@stimio.fr>
This commit is contained in:
Xavier Chapron 2020-11-06 15:55:24 +01:00 • committed by Anas Nashif
commit fa3d586483
1 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

24
drivers/modem/ublox-sara-r4.c
View file

@ -74,7 +74,7 @@ static struct modem_pin modem_pins[] = {
#define MDM_DNS_TIMEOUT K_SECONDS(70) #define MDM_DNS_TIMEOUT K_SECONDS(70)
#define MDM_CMD_CONN_TIMEOUT K_SECONDS(120) #define MDM_CMD_CONN_TIMEOUT K_SECONDS(120)
#define MDM_REGISTRATION_TIMEOUT K_SECONDS(180) #define MDM_REGISTRATION_TIMEOUT K_SECONDS(180)
#define MDM_PROMPT_CMD_DELAY K_MSEC(75) #define MDM_PROMPT_CMD_DELAY K_MSEC(50)
#define MDM_SENDMSG_SLEEP K_MSEC(1) #define MDM_SENDMSG_SLEEP K_MSEC(1)
#define MDM_MAX_DATA_LENGTH 1024 #define MDM_MAX_DATA_LENGTH 1024
@ -167,6 +167,9 @@ struct modem_data {
/* response semaphore */ /* response semaphore */
struct k_sem sem_response; struct k_sem sem_response;
/* prompt semaphore */
struct k_sem sem_prompt;
}; };
static struct modem_data mdata; static struct modem_data mdata;
@ -331,6 +334,9 @@ static ssize_t send_socket_data(struct modem_socket *sock,
k_sem_take(&mdata.cmd_handler_data.sem_tx_lock, K_FOREVER); k_sem_take(&mdata.cmd_handler_data.sem_tx_lock, K_FOREVER);
/* Reset prompt '@' semaphore */
k_sem_reset(&mdata.sem_prompt);
ret = modem_cmd_send_nolock(&mctx.iface, &mctx.cmd_handler, ret = modem_cmd_send_nolock(&mctx.iface, &mctx.cmd_handler,
NULL, 0U, send_buf, NULL, K_NO_WAIT); NULL, 0U, send_buf, NULL, K_NO_WAIT);
if (ret < 0) { if (ret < 0) {
@ -345,6 +351,9 @@ static ssize_t send_socket_data(struct modem_socket *sock,
goto exit; goto exit;
} }
/* Wait for prompt '@' */
k_sem_take(&mdata.sem_prompt, K_FOREVER);
/* slight pause per spec so that @ prompt is received */ /* slight pause per spec so that @ prompt is received */
k_sleep(MDM_PROMPT_CMD_DELAY); k_sleep(MDM_PROMPT_CMD_DELAY);
@ -394,6 +403,17 @@ MODEM_CMD_DEFINE(on_cmd_ok)
return 0; return 0;
} }
/* Handler: @ */
MODEM_CMD_DEFINE(on_prompt)
{
k_sem_give(&mdata.sem_prompt);
/* A direct cmd should return the number of byte processed.
* Therefore, here we always return 1
*/
return 1;
}
/* Handler: ERROR */ /* Handler: ERROR */
MODEM_CMD_DEFINE(on_cmd_error) MODEM_CMD_DEFINE(on_cmd_error)
{ {
@ -1708,6 +1728,7 @@ static const struct modem_cmd response_cmds[] = {
MODEM_CMD("OK", on_cmd_ok, 0U, ""), /* 3GPP */ MODEM_CMD("OK", on_cmd_ok, 0U, ""), /* 3GPP */
MODEM_CMD("ERROR", on_cmd_error, 0U, ""), /* 3GPP */ MODEM_CMD("ERROR", on_cmd_error, 0U, ""), /* 3GPP */
MODEM_CMD("+CME ERROR: ", on_cmd_exterror, 1U, ""), MODEM_CMD("+CME ERROR: ", on_cmd_exterror, 1U, ""),
MODEM_CMD_DIRECT("@", on_prompt),
}; };
static const struct modem_cmd unsol_cmds[] = { static const struct modem_cmd unsol_cmds[] = {
@ -1724,6 +1745,7 @@ static int modem_init(const struct device *dev)
ARG_UNUSED(dev); ARG_UNUSED(dev);
k_sem_init(&mdata.sem_response, 0, 1); k_sem_init(&mdata.sem_response, 0, 1);
k_sem_init(&mdata.sem_prompt, 0, 1);
/* initialize the work queue */ /* initialize the work queue */
k_work_q_start(&modem_workq, k_work_q_start(&modem_workq,