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

huawei: port set_current_modes to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-08-01 10:45:40 -07:00
committed by Aleksander Morgado
parent 5d9c4d70a1
commit bf03f1e2d7
1 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
plugins/huawei/mm-broadband-modem-huawei.c
View File

@@ -1349,31 +1349,30 @@ set_current_modes_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
set_current_modes_ready (MMBroadbandModemHuawei *self, set_current_modes_ready (MMBroadbandModemHuawei *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error); mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error);
if (error) if (error)
/* Let the error be critical. */ /* Let the error be critical. */
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);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
static gboolean static gboolean
prefmode_set_current_modes (MMBroadbandModemHuawei *self, prefmode_set_current_modes (MMBroadbandModemHuawei *self,
MMModemMode allowed, MMModemMode allowed,
MMModemMode preferred, MMModemMode preferred,
GSimpleAsyncResult *simple, GTask *task,
GError **error) GError **error)
{ {
guint i; guint i;
@@ -1407,7 +1406,7 @@ prefmode_set_current_modes (MMBroadbandModemHuawei *self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)set_current_modes_ready, (GAsyncReadyCallback)set_current_modes_ready,
simple); task);
g_free (command); g_free (command);
return TRUE; return TRUE;
} }
@@ -1416,7 +1415,7 @@ static gboolean
syscfg_set_current_modes (MMBroadbandModemHuawei *self, syscfg_set_current_modes (MMBroadbandModemHuawei *self,
MMModemMode allowed, MMModemMode allowed,
MMModemMode preferred, MMModemMode preferred,
GSimpleAsyncResult *simple, GTask *task,
GError **error) GError **error)
{ {
guint i; guint i;
@@ -1452,7 +1451,7 @@ syscfg_set_current_modes (MMBroadbandModemHuawei *self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)set_current_modes_ready, (GAsyncReadyCallback)set_current_modes_ready,
simple); task);
g_free (command); g_free (command);
return TRUE; return TRUE;
} }
@@ -1461,7 +1460,7 @@ static gboolean
syscfgex_set_current_modes (MMBroadbandModemHuawei *self, syscfgex_set_current_modes (MMBroadbandModemHuawei *self,
MMModemMode allowed, MMModemMode allowed,
MMModemMode preferred, MMModemMode preferred,
GSimpleAsyncResult *simple, GTask *task,
GError **error) GError **error)
{ {
guint i; guint i;
@@ -1496,7 +1495,7 @@ syscfgex_set_current_modes (MMBroadbandModemHuawei *self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)set_current_modes_ready, (GAsyncReadyCallback)set_current_modes_ready,
simple); task);
g_free (command); g_free (command);
return TRUE; return TRUE;
} }
@@ -1509,31 +1508,27 @@ set_current_modes (MMIfaceModem *_self,
gpointer user_data) gpointer user_data)
{ {
MMBroadbandModemHuawei *self = MM_BROADBAND_MODEM_HUAWEI (_self); MMBroadbandModemHuawei *self = MM_BROADBAND_MODEM_HUAWEI (_self);
GSimpleAsyncResult *result; GTask *task;
GError *error = NULL; GError *error = NULL;
mm_dbg ("setting current modes (huawei)..."); mm_dbg ("setting current modes (huawei)...");
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
set_current_modes);
if (self->priv->syscfgex_support == FEATURE_SUPPORTED) if (self->priv->syscfgex_support == FEATURE_SUPPORTED)
syscfgex_set_current_modes (self, allowed, preferred, result, &error); syscfgex_set_current_modes (self, allowed, preferred, task, &error);
else if (self->priv->syscfg_support == FEATURE_SUPPORTED) else if (self->priv->syscfg_support == FEATURE_SUPPORTED)
syscfg_set_current_modes (self, allowed, preferred, result, &error); syscfg_set_current_modes (self, allowed, preferred, task, &error);
else if (self->priv->prefmode_support == FEATURE_SUPPORTED) else if (self->priv->prefmode_support == FEATURE_SUPPORTED)
prefmode_set_current_modes (self, allowed, preferred, result, &error); prefmode_set_current_modes (self, allowed, preferred, task, &error);
else else
error = g_error_new (MM_CORE_ERROR, error = g_error_new (MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Setting current modes is not supported"); "Setting current modes is not supported");
if (error) { if (error) {
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);
} }
} }