diff options
Diffstat (limited to 'src/mm-broadband-modem-qmi.c')
-rw-r--r-- | src/mm-broadband-modem-qmi.c | 64 |
1 files changed, 2 insertions, 62 deletions
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c index aaffe2c6..973cd954 100644 --- a/src/mm-broadband-modem-qmi.c +++ b/src/mm-broadband-modem-qmi.c @@ -433,66 +433,6 @@ modem_load_manufacturer (MMIfaceModem *self, } /*****************************************************************************/ -/* Model loading (Modem interface) */ - -static gchar * -modem_load_model_finish (MMIfaceModem *self, - GAsyncResult *res, - GError **error) -{ - return g_task_propagate_pointer (G_TASK (res), error); -} - -static void -dms_get_model_ready (QmiClientDms *client, - GAsyncResult *res, - GTask *task) -{ - QmiMessageDmsGetModelOutput *output = NULL; - GError *error = NULL; - - output = qmi_client_dms_get_model_finish (client, res, &error); - if (!output) { - g_prefix_error (&error, "QMI operation failed: "); - g_task_return_error (task, error); - } else if (!qmi_message_dms_get_model_output_get_result (output, &error)) { - g_prefix_error (&error, "Couldn't get Model: "); - g_task_return_error (task, error); - } else { - const gchar *str; - - qmi_message_dms_get_model_output_get_model (output, &str, NULL); - g_task_return_pointer (task, g_strdup (str), g_free); - } - - if (output) - qmi_message_dms_get_model_output_unref (output); - - g_object_unref (task); -} - -static void -modem_load_model (MMIfaceModem *self, - GAsyncReadyCallback callback, - gpointer user_data) -{ - QmiClient *client = NULL; - - if (!mm_shared_qmi_ensure_client (MM_SHARED_QMI (self), - QMI_SERVICE_DMS, &client, - callback, user_data)) - return; - - mm_obj_dbg (self, "loading model..."); - qmi_client_dms_get_model (QMI_CLIENT_DMS (client), - NULL, - 5, - NULL, - (GAsyncReadyCallback)dms_get_model_ready, - g_task_new (self, NULL, callback, user_data)); -} - -/*****************************************************************************/ /* Revision loading (Modem interface) */ static gchar * @@ -11187,8 +11127,8 @@ iface_modem_init (MMIfaceModem *iface) iface->set_current_capabilities_finish = mm_shared_qmi_set_current_capabilities_finish; iface->load_manufacturer = modem_load_manufacturer; iface->load_manufacturer_finish = modem_load_manufacturer_finish; - iface->load_model = modem_load_model; - iface->load_model_finish = modem_load_model_finish; + iface->load_model = mm_shared_qmi_load_model; + iface->load_model_finish = mm_shared_qmi_load_model_finish; iface->load_revision = modem_load_revision; iface->load_revision_finish = modem_load_revision_finish; iface->load_hardware_revision = modem_load_hardware_revision; |