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

huawei: port load_current_modes to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-07-18 01:10:12 -07:00
committed by Aleksander Morgado
parent bf03f1e2d7
commit c7ec2c4fbb
1 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1188,19 +1188,21 @@ load_current_modes_finish (MMIfaceModem *self,
{ {
MMModemModeCombination *out; MMModemModeCombination *out;
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) out = g_task_propagate_pointer (G_TASK (res), error);
if (!out)
return FALSE; return FALSE;
out = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
*allowed = out->allowed; *allowed = out->allowed;
*preferred = out->preferred; *preferred = out->preferred;
g_free (out);
return TRUE; return TRUE;
} }
static void static void
prefmode_load_current_modes_ready (MMBroadbandModemHuawei *self, prefmode_load_current_modes_ready (MMBroadbandModemHuawei *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
const gchar *response; const gchar *response;
GError *error = NULL; GError *error = NULL;
@@ -1213,22 +1215,22 @@ prefmode_load_current_modes_ready (MMBroadbandModemHuawei *self,
&error); &error);
if (error) if (error)
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
else { else {
MMModemModeCombination out; MMModemModeCombination *out;
out.allowed = current->allowed; out = g_new (MMModemModeCombination, 1);
out.preferred = current->preferred; out->allowed = current->allowed;
g_simple_async_result_set_op_res_gpointer (simple, &out, NULL); out->preferred = current->preferred;
g_task_return_pointer (task, out, g_free);
} }
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
static void static void
syscfg_load_current_modes_ready (MMBroadbandModemHuawei *self, syscfg_load_current_modes_ready (MMBroadbandModemHuawei *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
const gchar *response; const gchar *response;
GError *error = NULL; GError *error = NULL;
@@ -1241,23 +1243,22 @@ syscfg_load_current_modes_ready (MMBroadbandModemHuawei *self,
&error); &error);
if (error) if (error)
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
else { else {
MMModemModeCombination out; MMModemModeCombination *out;
out.allowed = current->allowed; out = g_new (MMModemModeCombination, 1);
out.preferred = current->preferred; out->allowed = current->allowed;
g_simple_async_result_set_op_res_gpointer (simple, &out, NULL); out->preferred = current->preferred;
g_task_return_pointer (task, out, g_free);
} }
g_object_unref (task);
g_simple_async_result_complete (simple);
g_object_unref (simple);
} }
static void static void
syscfgex_load_current_modes_ready (MMBroadbandModemHuawei *self, syscfgex_load_current_modes_ready (MMBroadbandModemHuawei *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
const gchar *response; const gchar *response;
GError *error = NULL; GError *error = NULL;
@@ -1269,17 +1270,16 @@ syscfgex_load_current_modes_ready (MMBroadbandModemHuawei *self,
self->priv->syscfgex_supported_modes, self->priv->syscfgex_supported_modes,
&error); &error);
if (error) if (error)
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
else { else {
MMModemModeCombination out; MMModemModeCombination *out;
out.allowed = current->allowed; out = g_new (MMModemModeCombination, 1);
out.preferred = current->preferred; out->allowed = current->allowed;
g_simple_async_result_set_op_res_gpointer (simple, &out, NULL); out->preferred = current->preferred;
g_task_return_pointer (task, out, g_free);
} }
g_object_unref (task);
g_simple_async_result_complete (simple);
g_object_unref (simple);
} }
static void static void
@@ -1288,14 +1288,11 @@ load_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;
mm_dbg ("loading current modes (huawei)..."); mm_dbg ("loading current modes (huawei)...");
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
load_current_modes);
if (self->priv->syscfgex_support == FEATURE_SUPPORTED) { if (self->priv->syscfgex_support == FEATURE_SUPPORTED) {
g_assert (self->priv->syscfgex_supported_modes != NULL); g_assert (self->priv->syscfgex_supported_modes != NULL);
@@ -1305,7 +1302,7 @@ load_current_modes (MMIfaceModem *_self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)syscfgex_load_current_modes_ready, (GAsyncReadyCallback)syscfgex_load_current_modes_ready,
result); task);
return; return;
} }
@@ -1317,7 +1314,7 @@ load_current_modes (MMIfaceModem *_self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)syscfg_load_current_modes_ready, (GAsyncReadyCallback)syscfg_load_current_modes_ready,
result); task);
return; return;
} }
@@ -1329,16 +1326,15 @@ load_current_modes (MMIfaceModem *_self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)prefmode_load_current_modes_ready, (GAsyncReadyCallback)prefmode_load_current_modes_ready,
result); task);
return; return;
} }
g_simple_async_result_set_error (result, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Unable to load current modes"); "Unable to load current modes");
g_simple_async_result_complete_in_idle (result); g_object_unref (task);
g_object_unref (result);
} }
/*****************************************************************************/ /*****************************************************************************/