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

broadband-modem-qmi: prefer signal info indication if available

Browse Source 
Prefer signal info indication if available and fall back to
signal strength indication if the former is not supported.
This commit is contained in:
Daniele Palmas
2021-10-18 14:43:20 +02:00
committed by Aleksander Morgado
parent a1fdba508d
commit ba84f97855
1 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,9 +96,7 @@ struct _MMBroadbandModemQmiPrivate {
gboolean unsolicited_events_setup; gboolean unsolicited_events_setup;
guint nas_event_report_indication_id; guint nas_event_report_indication_id;
guint wds_event_report_indication_id; guint wds_event_report_indication_id;
#if defined WITH_NEWEST_QMI_COMMANDS
guint nas_signal_info_indication_id; guint nas_signal_info_indication_id;
#endif /* WITH_NEWEST_QMI_COMMANDS */
/* New devices may not support the legacy DMS UIM commands */ /* New devices may not support the legacy DMS UIM commands */
gboolean dms_uim_deprecated; gboolean dms_uim_deprecated;
@@ -5032,8 +5030,6 @@ common_enable_disable_unsolicited_events_data_system_status (GTask *task)
task); task);
} }
#if !defined WITH_NEWEST_QMI_COMMANDS
static void static void
ser_signal_strength_ready (QmiClientNas *client, ser_signal_strength_ready (QmiClientNas *client,
GAsyncResult *res, GAsyncResult *res,
@@ -5108,8 +5104,6 @@ common_enable_disable_unsolicited_events_signal_strength (GTask *task)
task); task);
} }
#else /* WITH_NEWEST_QMI_COMMANDS */
static void static void
ri_signal_info_ready (QmiClientNas *client, ri_signal_info_ready (QmiClientNas *client,
GAsyncResult *res, GAsyncResult *res,
@@ -5124,11 +5118,14 @@ ri_signal_info_ready (QmiClientNas *client,
ctx = g_task_get_task_data (task); ctx = g_task_get_task_data (task);
output = qmi_client_nas_register_indications_finish (client, res, &error); output = qmi_client_nas_register_indications_finish (client, res, &error);
if (!output || !qmi_message_nas_register_indications_output_get_result (output, &error)) if (!output || !qmi_message_nas_register_indications_output_get_result (output, &error)) {
mm_obj_dbg (self, "couldn't register signal info indications: '%s'", error->message); mm_obj_dbg (self, "couldn't register signal info indications: '%s', falling back to signal strength", error->message);
else { common_enable_disable_unsolicited_events_signal_strength (task);
g_clear_error (&error);
return;
} else {
/* Disable access technology and signal quality polling if we can use the indications */ /* Disable access technology and signal quality polling if we can use the indications */
mm_obj_dbg (self, "signal strength indications enabled: polling disabled"); mm_obj_dbg (self, "signal info indications enabled: polling disabled");
g_object_set (self, g_object_set (self,
MM_IFACE_MODEM_PERIODIC_SIGNAL_CHECK_DISABLED, TRUE, MM_IFACE_MODEM_PERIODIC_SIGNAL_CHECK_DISABLED, TRUE,
MM_IFACE_MODEM_PERIODIC_ACCESS_TECH_CHECK_DISABLED, TRUE, MM_IFACE_MODEM_PERIODIC_ACCESS_TECH_CHECK_DISABLED, TRUE,
@@ -5221,8 +5218,6 @@ common_enable_disable_unsolicited_events_signal_info_config (GTask *task)
task); task);
} }
#endif /* WITH_NEWEST_QMI_COMMANDS */
static void static void
common_enable_disable_unsolicited_events (MMBroadbandModemQmi *self, common_enable_disable_unsolicited_events (MMBroadbandModemQmi *self,
gboolean enable, gboolean enable,
@@ -5262,11 +5257,7 @@ common_enable_disable_unsolicited_events (MMBroadbandModemQmi *self,
g_task_set_task_data (task, ctx, (GDestroyNotify)enable_unsolicited_events_context_free); g_task_set_task_data (task, ctx, (GDestroyNotify)enable_unsolicited_events_context_free);
if (ctx->client_nas) { if (ctx->client_nas) {
#if defined WITH_NEWEST_QMI_COMMANDS
common_enable_disable_unsolicited_events_signal_info_config (task); common_enable_disable_unsolicited_events_signal_info_config (task);
#else
common_enable_disable_unsolicited_events_signal_strength (task);
#endif /* WITH_NEWEST_QMI_COMMANDS */
return; return;
} }
@@ -5410,8 +5401,6 @@ nas_event_report_indication_cb (QmiClientNas *client,
} }
} }
#if defined WITH_NEWEST_QMI_COMMANDS
static void static void
nas_signal_info_indication_cb (QmiClientNas *client, nas_signal_info_indication_cb (QmiClientNas *client,
QmiIndicationNasSignalInfoOutput *output, QmiIndicationNasSignalInfoOutput *output,
@@ -5447,8 +5436,6 @@ nas_signal_info_indication_cb (QmiClientNas *client,
} }
} }
#endif /* WITH_NEWEST_QMI_COMMANDS */
static void static void
common_setup_cleanup_unsolicited_events (MMBroadbandModemQmi *self, common_setup_cleanup_unsolicited_events (MMBroadbandModemQmi *self,
gboolean enable, gboolean enable,
@@ -5493,7 +5480,6 @@ common_setup_cleanup_unsolicited_events (MMBroadbandModemQmi *self,
self->priv->nas_event_report_indication_id = 0; self->priv->nas_event_report_indication_id = 0;
} }
#if defined WITH_NEWEST_QMI_COMMANDS
if (enable) { if (enable) {
g_assert (self->priv->nas_signal_info_indication_id == 0); g_assert (self->priv->nas_signal_info_indication_id == 0);
self->priv->nas_signal_info_indication_id = self->priv->nas_signal_info_indication_id =
@@ -5505,7 +5491,6 @@ common_setup_cleanup_unsolicited_events (MMBroadbandModemQmi *self,
g_signal_handler_disconnect (client_nas, self->priv->nas_signal_info_indication_id); g_signal_handler_disconnect (client_nas, self->priv->nas_signal_info_indication_id);
self->priv->nas_signal_info_indication_id = 0; self->priv->nas_signal_info_indication_id = 0;
} }
#endif /* WITH_NEWEST_QMI_COMMANDS */
} }
if (client_wds) { if (client_wds) {