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

broadband-modem-qmi: port modem_factory_reset to use GTask

Browse Source
This commit is contained in:
Ben Chan
2018-04-28 15:32:49 -07:00
committed by Aleksander Morgado
parent 641e1b8a43
commit 15ffa69d72
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3440,13 +3440,13 @@ modem_factory_reset_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); return g_task_propagate_boolean (G_TASK (res), error);
} }
static void static void
dms_restore_factory_defaults_ready (QmiClientDms *client, dms_restore_factory_defaults_ready (QmiClientDms *client,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
QmiMessageDmsRestoreFactoryDefaultsOutput *output = NULL; QmiMessageDmsRestoreFactoryDefaultsOutput *output = NULL;
GError *error = NULL; GError *error = NULL;
@@ -3454,19 +3454,17 @@ dms_restore_factory_defaults_ready (QmiClientDms *client,
output = qmi_client_dms_restore_factory_defaults_finish (client, res, &error); output = qmi_client_dms_restore_factory_defaults_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_restore_factory_defaults_output_get_result (output, &error)) { } else if (!qmi_message_dms_restore_factory_defaults_output_get_result (output, &error)) {
g_prefix_error (&error, "Couldn't restore factory defaults: "); g_prefix_error (&error, "Couldn't restore factory defaults: ");
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
} else { } else
g_simple_async_result_set_op_res_gboolean (simple, TRUE); g_task_return_boolean (task, TRUE);
}
if (output) if (output)
qmi_message_dms_restore_factory_defaults_output_unref (output); qmi_message_dms_restore_factory_defaults_output_unref (output);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
static void static void
@@ -3476,19 +3474,16 @@ modem_factory_reset (MMIfaceModem *self,
gpointer user_data) gpointer user_data)
{ {
QmiMessageDmsRestoreFactoryDefaultsInput *input; QmiMessageDmsRestoreFactoryDefaultsInput *input;
GSimpleAsyncResult *result; GTask *task;
QmiClient *client = NULL; QmiClient *client = NULL;
GError *error = NULL; GError *error = 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), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
modem_factory_reset);
input = qmi_message_dms_restore_factory_defaults_input_new (); input = qmi_message_dms_restore_factory_defaults_input_new ();
if (!qmi_message_dms_restore_factory_defaults_input_set_service_programming_code ( if (!qmi_message_dms_restore_factory_defaults_input_set_service_programming_code (
@@ -3496,9 +3491,8 @@ modem_factory_reset (MMIfaceModem *self,
code, code,
&error)) { &error)) {
qmi_message_dms_restore_factory_defaults_input_unref (input); qmi_message_dms_restore_factory_defaults_input_unref (input);
g_simple_async_result_take_error (result, error); g_task_return_error (task, error);
g_simple_async_result_complete_in_idle (result); g_object_unref (task);
g_object_unref (result);
return; return;
} }
@@ -3508,7 +3502,7 @@ modem_factory_reset (MMIfaceModem *self,
10, 10,
NULL, NULL,
(GAsyncReadyCallback)dms_restore_factory_defaults_ready, (GAsyncReadyCallback)dms_restore_factory_defaults_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/