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

mm-shared-qmi: Fix current modes

Browse Source 
Modem reports 2G+3G+4G+5G current modes, while 2G is not supported.

Consider device capabilities in deciding current modes.
This commit is contained in:
Akash Aggarwal
2022-08-17 19:49:51 +05:30
parent 451eb040cd
commit 20c558546c
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/mm-shared-qmi.c
View File

@@ -1470,17 +1470,38 @@ mm_shared_qmi_load_current_modes_finish (MMIfaceModem *self,
return TRUE;
}
static MMModemMode
filter_modes_by_supported_radio_interfaces (MMSharedQmi *self,
GArray *supported_radio_interfaces,
MMModemMode allowed_modes)
{
MMModemMode modem_modes;
guint i;
modem_modes = MM_MODEM_MODE_NONE;
for (i = 0; i < supported_radio_interfaces->len; i++)
modem_modes |= mm_modem_mode_from_qmi_radio_interface (g_array_index (supported_radio_interfaces, QmiDmsRadioInterface, i), self);
return allowed_modes & modem_modes;
}
static void
get_technology_preference_ready (QmiClientNas *client,
GAsyncResult *res,
GTask *task)
{
MMSharedQmi *self;
Private *priv;
LoadCurrentModesResult *result = NULL;
QmiMessageNasGetTechnologyPreferenceOutput *output = NULL;
GError *error = NULL;
MMModemMode allowed;
QmiNasRadioTechnologyPreference preference_mask;
self = g_task_get_source_object (task);
priv = get_private (self);
output = qmi_client_nas_get_technology_preference_finish (client, res, &error);
if (!output || !qmi_message_nas_get_technology_preference_output_get_result (output, &error)) {
g_task_return_error (task, error);
@@ -1503,6 +1524,9 @@ get_technology_preference_ready (QmiClientNas *client,
goto out;
}
g_assert (priv->supported_radio_interfaces);
allowed = filter_modes_by_supported_radio_interfaces (self, priv->supported_radio_interfaces, allowed);
/* We got a valid value from here */
result = g_new (LoadCurrentModesResult, 1);
result->allowed = allowed;
@@ -1573,6 +1597,9 @@ load_current_modes_system_selection_preference_ready (QmiClientNas *client,
goto out;
}
g_assert (priv->supported_radio_interfaces);
allowed = filter_modes_by_supported_radio_interfaces (self, priv->supported_radio_interfaces, allowed);
/* We got a valid value from here */
result = g_new (LoadCurrentModesResult, 1);
result->allowed = allowed;