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

broadband-modem-qmi: use UIM Get Configuration to probe all facility locks

Browse Source
This commit is contained in:
Michal Mazur
2021-02-16 21:31:02 +01:00
committed by Aleksander Morgado
parent ab60f88403
commit 2a2ae2819c
1 changed files with 61 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/mm-broadband-modem-qmi.c
View File

@@ -2141,14 +2141,44 @@ get_sim_lock_status_via_get_card_status_ready (QmiClientUim *client,
}
static void
get_sim_lock_status_via_get_card_status (GTask *task)
get_pin_lock_status_via_get_configuration_ready (QmiClientUim *client,
GAsyncResult *res,
GTask *task)
{
MMBroadbandModemQmi *self;
MMModem3gppFacility lock = MM_MODEM_3GPP_FACILITY_NONE;
QmiMessageUimGetConfigurationOutput *output;
LoadEnabledFacilityLocksContext *ctx;
MMBroadbandModemQmi *self;
GError *error = NULL;
self = g_task_get_source_object (task);
ctx = g_task_get_task_data (task);
output = qmi_client_uim_get_configuration_finish (client, res, &error);
if (!output ||
!qmi_message_uim_get_configuration_output_get_result (output, &error)) {
g_prefix_error (&error, "QMI message Get Configuration failed: ");
g_task_return_error (task, error);
g_object_unref (task);
if (output)
qmi_message_uim_get_configuration_output_unref (output);
return;
}
if (!mm_qmi_uim_get_configuration_output_parse (self,
output,
&lock,
&error)) {
g_prefix_error (&error, "QMI operation failed: ");
g_task_return_error (task, error);
g_object_unref (task);
qmi_message_uim_get_configuration_output_unref (output);
return;
}
ctx->locks = lock;
qmi_message_uim_get_configuration_output_unref (output);
mm_obj_dbg (self, "Getting UIM card status to read pin lock state...");
qmi_client_uim_get_card_status (QMI_CLIENT_UIM (ctx->client),
NULL,
@@ -2158,6 +2188,32 @@ get_sim_lock_status_via_get_card_status (GTask *task)
task);
}
static void
get_facility_lock_status_via_uim (GTask *task)
{
QmiMessageUimGetConfigurationInput *input;
LoadEnabledFacilityLocksContext *ctx;
MMBroadbandModemQmi *self;
self = g_task_get_source_object (task);
ctx = g_task_get_task_data (task);
mm_obj_dbg (self, "Getting UIM Get Configuration to read facility lock state...");
input = qmi_message_uim_get_configuration_input_new ();
qmi_message_uim_get_configuration_input_set_configuration_mask (
input,
QMI_UIM_CONFIGURATION_PERSONALIZATION_STATUS,
NULL);
qmi_client_uim_get_configuration (QMI_CLIENT_UIM (ctx->client),
input,
5,
NULL,
(GAsyncReadyCallback)get_pin_lock_status_via_get_configuration_ready,
task);
qmi_message_uim_get_configuration_input_unref (input);
}
static void
get_sim_lock_status_via_pin_status_ready (QmiClientDms *client,
GAsyncResult *res,
@@ -2379,12 +2435,12 @@ modem_3gpp_load_enabled_facility_locks (MMIfaceModem3gpp *self,
g_task_set_task_data (task, ctx, (GDestroyNotify)load_enabled_facility_locks_context_free);
/* DMS uses get_ck_status and get_pin_status to probe facilities
* UIM Messages to get all facility locks are not open-source yet
* UIM uses get_card_status to probe only FACILITY_SIM and FACILITY_FIXED_DIALING */
* UIM uses get_card_status and get_configuration
*/
if (!MM_BROADBAND_MODEM_QMI (self)->priv->dms_uim_deprecated)
get_next_facility_lock_status_via_dms (task);
else
get_sim_lock_status_via_get_card_status (task);
get_facility_lock_status_via_uim (task);
}
/*****************************************************************************/