aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mm-broadband-modem-qmi.c23
1 files changed, 18 insertions, 5 deletions
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c
index 50050b8f..11b3fb31 100644
--- a/src/mm-broadband-modem-qmi.c
+++ b/src/mm-broadband-modem-qmi.c
@@ -1589,7 +1589,7 @@ get_signal_info_ready (QmiClientNas *client,
qmi_message_nas_get_signal_info_output_unref (output);
}
-#endif /* WITH_NEWEST_QMI_COMMANDS */
+#else /* WITH_NEWEST_QMI_COMMANDS */
static gboolean
signal_strength_get_quality_and_access_tech (MMBroadbandModemQmi *self,
@@ -1698,6 +1698,8 @@ get_signal_strength_ready (QmiClientNas *client,
qmi_message_nas_get_signal_strength_output_unref (output);
}
+#endif /* WITH_NEWEST_QMI_COMMANDS */
+
static void
load_signal_quality (MMIfaceModem *self,
GAsyncReadyCallback callback,
@@ -2586,6 +2588,8 @@ modem_3gpp_run_registration_checks_finish (MMIfaceModem3gpp *self,
return g_task_propagate_boolean (G_TASK (res), error);
}
+#if !defined WITH_NEWEST_QMI_COMMANDS
+
static void
common_process_serving_system_3gpp (MMBroadbandModemQmi *self,
QmiMessageNasGetServingSystemOutput *response_output,
@@ -2842,7 +2846,7 @@ get_serving_system_3gpp_ready (QmiClientNas *client,
qmi_message_nas_get_serving_system_output_unref (output);
}
-#if defined WITH_NEWEST_QMI_COMMANDS
+#else /* WITH_NEWEST_QMI_COMMANDS */
static gboolean
process_common_info (QmiNasServiceStatus service_status,
@@ -3464,6 +3468,8 @@ ri_serving_system_or_system_info_ready (QmiClientNas *client,
g_object_unref (task);
}
+#if !defined WITH_NEWEST_QMI_COMMANDS
+
static void
common_enable_disable_unsolicited_registration_events_serving_system (GTask *task)
{
@@ -3482,7 +3488,8 @@ common_enable_disable_unsolicited_registration_events_serving_system (GTask *tas
task);
}
-#if defined WITH_NEWEST_QMI_COMMANDS
+#else /* WITH_NEWEST_QMI_COMMANDS */
+
static void
common_enable_disable_unsolicited_registration_events_system_info (GTask *task)
{
@@ -3500,6 +3507,7 @@ common_enable_disable_unsolicited_registration_events_system_info (GTask *task)
(GAsyncReadyCallback)ri_serving_system_or_system_info_ready,
task);
}
+
#endif /* WITH_NEWEST_QMI_COMMANDS */
static void
@@ -4522,7 +4530,8 @@ system_info_indication_cb (QmiClientNas *client,
if (mm_iface_modem_is_3gpp (MM_IFACE_MODEM (self)))
common_process_system_info_3gpp (self, NULL, output);
}
-#endif
+
+#else /* WITH_NEWEST_QMI_COMMANDS */
static void
serving_system_indication_cb (QmiClientNas *client,
@@ -4535,6 +4544,8 @@ serving_system_indication_cb (QmiClientNas *client,
common_process_serving_system_cdma (self, NULL, output);
}
+#endif
+
static void
common_setup_cleanup_unsolicited_registration_events (MMBroadbandModemQmi *self,
gboolean enable,
@@ -4714,6 +4725,8 @@ common_enable_disable_unsolicited_events_finish (MMBroadbandModemQmi *self,
return g_task_propagate_boolean (G_TASK (res), error);
}
+#if !defined WITH_NEWEST_QMI_COMMANDS
+
static void
ser_signal_strength_ready (QmiClientNas *client,
GAsyncResult *res,
@@ -4771,7 +4784,7 @@ common_enable_disable_unsolicited_events_signal_strength (GTask *task)
task);
}
-#if defined WITH_NEWEST_QMI_COMMANDS
+#else /* WITH_NEWEST_QMI_COMMANDS */
static void
ri_signal_info_ready (QmiClientNas *client,