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

icera: port modem_set_current_modes to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-09-13 16:36:49 +02:00
committed by Aleksander Morgado
parent aa2cd2288a
commit 6612ffcb8b
1 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/icera/mm-broadband-modem-icera.c
+17 -22
View File
@@ -305,24 +305,24 @@ modem_set_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res,
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
allowed_mode_update_ready (MMBaseModem *self,
GAsyncResult *res,
GSimpleAsyncResult *operation_result)
GTask *task)
{
GError *error = NULL;
mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error);
if (error)
/* Let the error be critical. */
g_simple_async_result_take_error (operation_result, error);
g_task_return_error (task, error);
else
g_simple_async_result_set_op_res_gboolean (operation_result, TRUE);
g_simple_async_result_complete (operation_result);
g_object_unref (operation_result);
g_task_return_boolean (task, TRUE);
g_object_unref (task);
}
static void
@@ -332,14 +332,11 @@ modem_set_current_modes (MMIfaceModem *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
GSimpleAsyncResult *result;
GTask *task;
gchar *command;
gint icera_mode = -1;
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
modem_set_current_modes);
task = g_task_new (self, NULL, callback, user_data);
/*
* The core has checked the following:
@@ -366,18 +363,16 @@ modem_set_current_modes (MMIfaceModem *self,
allowed_str = mm_modem_mode_build_string_from_mask (allowed);
preferred_str = mm_modem_mode_build_string_from_mask (preferred);
g_simple_async_result_set_error (result,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"Requested mode (allowed: '%s', preferred: '%s') not "
"supported by the modem.",
allowed_str,
preferred_str);
g_task_return_new_error (task,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"Requested mode (allowed: '%s', preferred: '%s') not "
"supported by the modem.",
allowed_str,
preferred_str);
g_object_unref (task);
g_free (allowed_str);
g_free (preferred_str);
g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
return;
}
@@ -388,7 +383,7 @@ modem_set_current_modes (MMIfaceModem *self,
3,
FALSE,
(GAsyncReadyCallback)allowed_mode_update_ready,
result);
task);
g_free (command);
}