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

sierra: port mm_common_sierra_modem_power_up to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-09-08 13:20:42 -07:00
committed by Aleksander Morgado
parent c401646db8
commit 1eb51d96f7
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/sierra/mm-common-sierra.c
View File

@@ -247,22 +247,21 @@ mm_common_sierra_modem_power_up_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 gboolean static gboolean
sierra_power_up_wait_cb (GSimpleAsyncResult *result) sierra_power_up_wait_cb (GTask *task)
{ {
g_simple_async_result_set_op_res_gboolean (result, TRUE); g_task_return_boolean (task, TRUE);
g_simple_async_result_complete (result); g_object_unref (task);
g_object_unref (result);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
static void static void
cfun_enable_ready (MMBaseModem *self, cfun_enable_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
guint i; guint i;
@@ -270,9 +269,8 @@ cfun_enable_ready (MMBaseModem *self,
gboolean is_new_sierra = FALSE; gboolean is_new_sierra = FALSE;
if (!mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error)) { if (!mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error)) {
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
return; return;
} }
@@ -291,24 +289,23 @@ cfun_enable_ready (MMBaseModem *self,
} }
} }
/* The modem object will be valid in the callback as 'result' keeps a /* The modem object will be valid in the callback as 'task' keeps a
* reference to it. */ * reference to it. */
g_timeout_add_seconds (is_new_sierra ? 5 : 10, (GSourceFunc)sierra_power_up_wait_cb, simple); g_timeout_add_seconds (is_new_sierra ? 5 : 10, (GSourceFunc)sierra_power_up_wait_cb, task);
} }
static void static void
pcstate_enable_ready (MMBaseModem *self, pcstate_enable_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
/* Ignore errors for now; we're not sure if all Sierra CDMA devices support /* Ignore errors for now; we're not sure if all Sierra CDMA devices support
* at!pcstate. * at!pcstate.
*/ */
mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, NULL); mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, NULL);
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);
} }
void void
@@ -316,12 +313,9 @@ mm_common_sierra_modem_power_up (MMIfaceModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
mm_common_sierra_modem_power_up);
/* For CDMA modems, run !pcstate */ /* For CDMA modems, run !pcstate */
if (mm_iface_modem_is_cdma_only (self)) { if (mm_iface_modem_is_cdma_only (self)) {
@@ -330,7 +324,7 @@ mm_common_sierra_modem_power_up (MMIfaceModem *self,
5, 5,
FALSE, FALSE,
(GAsyncReadyCallback)pcstate_enable_ready, (GAsyncReadyCallback)pcstate_enable_ready,
result); task);
return; return;
} }
@@ -345,7 +339,7 @@ mm_common_sierra_modem_power_up (MMIfaceModem *self,
10, 10,
FALSE, FALSE,
(GAsyncReadyCallback)cfun_enable_ready, (GAsyncReadyCallback)cfun_enable_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/