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

broadband-modem-mbim,qmi-shared: Fallback from qmi uim service only when not supported

Browse Source 
When using qmi uim service from mbim broadband modem, a fallback from using
qmi uim service to normal mbim operations is done every time a call to
qmi_set_primary_sim_slot fails. But this may fall for various reasons,
and a fallback only makes sense when the device does not support that call

Patch reworked by Aleksander Morgado <aleksandermj@chromium.org>
This commit is contained in:
Ulrich Mohr
2023-01-18 11:14:14 +00:00
committed by Aleksander Morgado
parent 766962167c
commit 5ed79518be
2 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-broadband-modem-mbim.c
+10 -2
View File
@@ -8968,8 +8968,16 @@ shared_qmi_set_primary_sim_slot_ready (MMIfaceModem *self,
GAsyncResult *res,
GTask *task)
{
if (!mm_shared_qmi_set_primary_sim_slot_finish (self, res, NULL)) {
set_primary_sim_slot_mbim (task);
g_autoptr(GError) error = NULL;
if (!mm_shared_qmi_set_primary_sim_slot_finish (self, res, &error)) {
/* Fallback to MBIM */
if (g_error_matches (error, MM_CORE_ERROR, MM_CORE_ERROR_UNSUPPORTED)) {
set_primary_sim_slot_mbim (task);
return;
}
g_task_return_error (task, g_steal_pointer (&error));
g_object_unref (task);
return;
}
src/mm-shared-qmi.c
+22 -10
View File
@@ -3320,7 +3320,7 @@ uim_get_slot_status_ready (QmiClientUim *client,
LoadSimSlotsContext *ctx;
MMIfaceModem *self;
Private *priv;
GError *error = NULL;
g_autoptr(GError) error = NULL;
GArray *physical_slots = NULL;
GArray *ext_information = NULL;
GArray *slot_eids = NULL;
@@ -3334,7 +3334,13 @@ uim_get_slot_status_ready (QmiClientUim *client,
if (!output ||
!qmi_message_uim_get_slot_status_output_get_result (output, &error) ||
!qmi_message_uim_get_slot_status_output_get_physical_slot_status (output, &physical_slots, &error)) {
g_task_return_error (task, error);
if (g_error_matches (error, QMI_PROTOCOL_ERROR, QMI_PROTOCOL_ERROR_DEVICE_UNSUPPORTED) ||
g_error_matches (error, QMI_PROTOCOL_ERROR, QMI_PROTOCOL_ERROR_INVALID_QMI_COMMAND) ||
g_error_matches (error, QMI_PROTOCOL_ERROR, QMI_PROTOCOL_ERROR_NOT_SUPPORTED))
g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_UNSUPPORTED,
"QMI SIM slot switch operation not supported");
else
g_task_return_error (task, g_steal_pointer (&error));
g_object_unref (task);
return;
}
@@ -3503,13 +3509,13 @@ uim_switch_get_slot_status_ready (QmiClientUim *client,
{
g_autoptr(QmiMessageUimGetSlotStatusOutput) output = NULL;
g_autoptr(QmiMessageUimSwitchSlotInput) input = NULL;
MMIfaceModem *self;
GError *error = NULL;
GArray *physical_slots = NULL;
guint i;
guint active_logical_id = 0;
guint active_slot_number;
guint slot_number;
MMIfaceModem *self;
g_autoptr(GError) error = NULL;
GArray *physical_slots = NULL;
guint i;
guint active_logical_id = 0;
guint active_slot_number;
guint slot_number;
self = g_task_get_source_object (task);
slot_number = GPOINTER_TO_UINT (g_task_get_task_data (task));
@@ -3518,7 +3524,13 @@ uim_switch_get_slot_status_ready (QmiClientUim *client,
if (!output ||
!qmi_message_uim_get_slot_status_output_get_result (output, &error) ||
!qmi_message_uim_get_slot_status_output_get_physical_slot_status (output, &physical_slots, &error)) {
g_task_return_error (task, error);
if (g_error_matches (error, QMI_PROTOCOL_ERROR, QMI_PROTOCOL_ERROR_DEVICE_UNSUPPORTED) ||
g_error_matches (error, QMI_PROTOCOL_ERROR, QMI_PROTOCOL_ERROR_INVALID_QMI_COMMAND) ||
g_error_matches (error, QMI_PROTOCOL_ERROR, QMI_PROTOCOL_ERROR_NOT_SUPPORTED))
g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_UNSUPPORTED,
"QMI SIM slot switch operation not supported");
else
g_task_return_error (task, g_steal_pointer (&error));
g_object_unref (task);
return;
}