michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: modem: gsm: move the rssi query an individual function

Browse source 
Move the rssi query part out from the rssi_handler work item as
an individual function, so that it can be used directly without
referencing the work.

Signed-off-by: Yong Cong Sin <yongcong.sin@gmail.com>
This commit is contained in:
Yong Cong Sin 2022-02-20 17:51:29 +08:00 • committed by Carles Cufí
commit 975bc85b14
1 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

37
drivers/modem/gsm_ppp.c
View file

@ -621,30 +621,47 @@ static void set_ppp_carrier_on(struct gsm_modem *gsm)
} }
} }
static void rssi_handler(struct k_work *work) static void query_rssi(struct gsm_modem *gsm, bool lock)
{ {
int ret; int ret;
struct k_work_delayable *dwork = k_work_delayable_from_work(work);
struct gsm_modem *gsm = CONTAINER_OF(dwork, struct gsm_modem, rssi_work_handle);
#if defined(CONFIG_MODEM_GSM_ENABLE_CESQ_RSSI) #if defined(CONFIG_MODEM_GSM_ENABLE_CESQ_RSSI)
ret = modem_cmd_send_nolock(&gsm->context.iface, &gsm->context.cmd_handler, ret = modem_cmd_send_ext(&gsm->context.iface, &gsm->context.cmd_handler, &read_rssi_cmd, 1,
&read_rssi_cmd, 1, "AT+CESQ", &gsm->sem_response, GSM_CMD_SETUP_TIMEOUT); "AT+CESQ", &gsm->sem_response, GSM_CMD_SETUP_TIMEOUT,
lock ? 0 : MODEM_NO_TX_LOCK);
#else #else
ret = modem_cmd_send_nolock(&gsm->context.iface, &gsm->context.cmd_handler, ret = modem_cmd_send_ext(&gsm->context.iface, &gsm->context.cmd_handler, &read_rssi_cmd, 1,
&read_rssi_cmd, 1, "AT+CSQ", &gsm->sem_response, GSM_CMD_SETUP_TIMEOUT); "AT+CSQ", &gsm->sem_response, GSM_CMD_SETUP_TIMEOUT,
lock ? 0 : MODEM_NO_TX_LOCK);
#endif #endif
if (ret < 0) { if (ret < 0) {
LOG_DBG("No answer to RSSI readout, %s", "ignoring..."); LOG_DBG("No answer to RSSI readout, %s", "ignoring...");
} }
}
static inline void query_rssi_lock(struct gsm_modem *gsm)
{
query_rssi(gsm, true);
}
static inline void query_rssi_nolock(struct gsm_modem *gsm)
{
query_rssi(gsm, false);
}
static void rssi_handler(struct k_work *work)
{
struct k_work_delayable *dwork = k_work_delayable_from_work(work);
struct gsm_modem *gsm = CONTAINER_OF(dwork, struct gsm_modem, rssi_work_handle);
query_rssi_lock(gsm);
if (IS_ENABLED(CONFIG_GSM_MUX)) {
#if defined(CONFIG_MODEM_CELL_INFO) #if defined(CONFIG_MODEM_CELL_INFO)
(void)gsm_query_cellinfo(gsm); (void)gsm_query_cellinfo(gsm);
#endif #endif
(void)gsm_work_reschedule(&gsm->rssi_work_handle, (void)gsm_work_reschedule(&gsm->rssi_work_handle,
K_SECONDS(CONFIG_MODEM_GSM_RSSI_POLLING_PERIOD)); K_SECONDS(CONFIG_MODEM_GSM_RSSI_POLLING_PERIOD));
}
} }
static void gsm_finalize_connection(struct k_work *work) static void gsm_finalize_connection(struct k_work *work)
@ -782,7 +799,7 @@ attaching:
if (!IS_ENABLED(CONFIG_GSM_MUX)) { if (!IS_ENABLED(CONFIG_GSM_MUX)) {
/* Read connection quality (RSSI) before PPP carrier is ON */ /* Read connection quality (RSSI) before PPP carrier is ON */
rssi_handler(&gsm->rssi_work_handle.work); query_rssi_nolock(gsm);
if (!(gsm->minfo.mdm_rssi && gsm->minfo.mdm_rssi != GSM_RSSI_INVALID && if (!(gsm->minfo.mdm_rssi && gsm->minfo.mdm_rssi != GSM_RSSI_INVALID &&
gsm->minfo.mdm_rssi < GSM_RSSI_MAXVAL)) { gsm->minfo.mdm_rssi < GSM_RSSI_MAXVAL)) {