SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base-modem: retry AT+CNUM a couple times if the SIM is busy

Browse Source 
Seen on a Huawei UMG1831 when plugged in while ModemManager is already running.

ModemManager[45407]: <dbg> [1707842298.719505] [ttyUSB2/at] device open count is 3 (open)
ModemManager[45407]: <dbg> [1707842298.719642] [ttyUSB2/at] --> 'AT+CNUM<CR>'
ModemManager[45407]: <dbg> [1707842298.728802] [ttyUSB2/at] <-- '<CR><LF>+CME ERROR: 14<CR><LF>'
ModemManager[45407]: <dbg> [1707842298.728946] [ttyUSB2/at] operation failure: 14 (SIM busy)
ModemManager[45407]: <dbg> [1707842302.097846] [ttyUSB2/at] --> 'AT+CNUM<CR>'
ModemManager[45407]: <dbg> [1707842302.109435] [ttyUSB2/at] <-- '<CR><LF>+CME ERROR: 14<CR><LF>'
ModemManager[45407]: <dbg> [1707842302.109645] [ttyUSB2/at] operation failure: 14 (SIM busy)
ModemManager[45407]: <dbg> [1707842305.098165] [ttyUSB2/at] --> 'AT+CNUM<CR>'
ModemManager[45407]: <dbg> [1707842305.107692] [ttyUSB2/at] <-- '<CR><LF>+CNUM: "","+11234567890",145<CR><LF><CR><LF><CR><LF>OK<CR><LF>'

Signed-off-by: Dan Williams <dcbw@redhat.com>
This commit is contained in:
Dan Williams
2024-02-19 11:24:27 +00:00
committed by Aleksander Morgado
parent ded76a0abb
commit 004450f9a9
1 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-broadband-modem.c
+45 -10
View File
@@ -1363,19 +1363,53 @@ mdn_qcdm_ready (MMPortSerialQcdm *port,
qcdm_result_unref (result);
}
static MMBaseModemAtResponseProcessorResult
modem_load_own_numbers_continue_on_sim_busy (MMBaseModem *self,
gpointer none,
const gchar *command,
const gchar *response,
gboolean last_command,
const GError *error,
GVariant **result,
GError **result_error)
{
if (error) {
*result = NULL;
if (!g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_SIM_BUSY) || last_command) {
*result_error = g_error_copy (error);
return MM_BASE_MODEM_AT_RESPONSE_PROCESSOR_RESULT_FAILURE;
}
/* Retry on SIM BUSY errors */
*result_error = NULL;
return MM_BASE_MODEM_AT_RESPONSE_PROCESSOR_RESULT_CONTINUE;
}
*result = g_variant_new_string (response);
return MM_BASE_MODEM_AT_RESPONSE_PROCESSOR_RESULT_SUCCESS;
}
static const MMBaseModemAtCommand own_numbers_sequence[] = {
{ "+CNUM", 3, FALSE, modem_load_own_numbers_continue_on_sim_busy, 0 },
{ "+CNUM", 3, FALSE, modem_load_own_numbers_continue_on_sim_busy, 3 },
{ "+CNUM", 3, FALSE, modem_load_own_numbers_continue_on_sim_busy, 3 },
{ NULL }
};
static void
modem_load_own_numbers_done (MMIfaceModem *self,
modem_load_own_numbers_ready (MMIfaceModem *self,
GAsyncResult *res,
GTask *task)
{
OwnNumbersContext *ctx;
const gchar *result;
GVariant *result;
GError *error = NULL;
GStrv numbers;
ctx = g_task_get_task_data (task);
result = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error);
result = mm_base_modem_at_sequence_finish (MM_BASE_MODEM (self), res, NULL, &error);
if (!result) {
/* try QCDM */
if (ctx->qcdm) {
@@ -1398,7 +1432,7 @@ modem_load_own_numbers_done (MMIfaceModem *self,
}
g_task_return_error (task, error);
} else {
numbers = mm_3gpp_parse_cnum_exec_response (result);
numbers = mm_3gpp_parse_cnum_exec_response (g_variant_get_string (result, NULL));
g_task_return_pointer (task, numbers, (GDestroyNotify)g_strfreev);
}
g_object_unref (task);
@@ -1430,12 +1464,13 @@ modem_load_own_numbers (MMIfaceModem *self,
g_task_set_task_data (task, ctx, (GDestroyNotify)own_numbers_context_free);
mm_obj_dbg (self, "loading own numbers...");
mm_base_modem_at_command (MM_BASE_MODEM (self),
"+CNUM",
3,
FALSE,
(GAsyncReadyCallback)modem_load_own_numbers_done,
task);
mm_base_modem_at_sequence (
MM_BASE_MODEM (self),
own_numbers_sequence,
NULL, /* response_processor_context */
NULL, /* response_processor_context_free */
(GAsyncReadyCallback)modem_load_own_numbers_ready,
task);
}
/*****************************************************************************/