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

broadband-modem-qmi: port modem_load_model to use GTask

Browse Source
This commit is contained in:
Ben Chan
2018-04-26 18:47:05 -07:00
committed by Aleksander Morgado
parent 0bf2800d05
commit 3c17065636
1 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -987,20 +987,13 @@ modem_load_model_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
gchar *model; return g_task_propagate_pointer (G_TASK (res), error);
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
return NULL;
model = g_strdup (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)));
mm_dbg ("loaded model: %s", model);
return model;
} }
static void static void
dms_get_model_ready (QmiClientDms *client, dms_get_model_ready (QmiClientDms *client,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
QmiMessageDmsGetModelOutput *output = NULL; QmiMessageDmsGetModelOutput *output = NULL;
GError *error = NULL; GError *error = NULL;
@@ -1008,24 +1001,21 @@ dms_get_model_ready (QmiClientDms *client,
output = qmi_client_dms_get_model_finish (client, res, &error); output = qmi_client_dms_get_model_finish (client, res, &error);
if (!output) { if (!output) {
g_prefix_error (&error, "QMI operation failed: "); g_prefix_error (&error, "QMI operation failed: ");
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
} else if (!qmi_message_dms_get_model_output_get_result (output, &error)) { } else if (!qmi_message_dms_get_model_output_get_result (output, &error)) {
g_prefix_error (&error, "Couldn't get Model: "); g_prefix_error (&error, "Couldn't get Model: ");
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
} else { } else {
const gchar *str; const gchar *str;
qmi_message_dms_get_model_output_get_model (output, &str, NULL); qmi_message_dms_get_model_output_get_model (output, &str, NULL);
g_simple_async_result_set_op_res_gpointer (simple, g_task_return_pointer (task, g_strdup (str), g_free);
g_strdup (str),
g_free);
} }
if (output) if (output)
qmi_message_dms_get_model_output_unref (output); qmi_message_dms_get_model_output_unref (output);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
static void static void
@@ -1033,26 +1023,20 @@ modem_load_model (MMIfaceModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result;
QmiClient *client = NULL; QmiClient *client = NULL;
if (!ensure_qmi_client (MM_BROADBAND_MODEM_QMI (self), if (!assure_qmi_client (MM_BROADBAND_MODEM_QMI (self),
QMI_SERVICE_DMS, &client, QMI_SERVICE_DMS, &client,
callback, user_data)) callback, user_data))
return; return;
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
modem_load_model);
mm_dbg ("loading model..."); mm_dbg ("loading model...");
qmi_client_dms_get_model (QMI_CLIENT_DMS (client), qmi_client_dms_get_model (QMI_CLIENT_DMS (client),
NULL, NULL,
5, 5,
NULL, NULL,
(GAsyncReadyCallback)dms_get_model_ready, (GAsyncReadyCallback)dms_get_model_ready,
result); g_task_new (self, NULL, callback, user_data));
} }
/*****************************************************************************/ /*****************************************************************************/