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

sierra: port modem_power_down to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-09-14 22:59:31 -07:00
committed by Aleksander Morgado
parent 841d175961
commit 26be99b8a7
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/sierra/mm-broadband-modem-sierra.c
View File

@@ -1133,22 +1133,21 @@ modem_power_down_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
modem_power_down_ready (MMBaseModem *self, modem_power_down_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 or 3GPP devices support +CFUN=4. * at!pcstate or 3GPP devices support +CFUN=4.
*/ */
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);
} }
static void static void
@@ -1156,12 +1155,9 @@ modem_power_down (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,
modem_power_down);
/* 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)) {
@@ -1170,7 +1166,7 @@ modem_power_down (MMIfaceModem *self,
5, 5,
FALSE, FALSE,
(GAsyncReadyCallback)modem_power_down_ready, (GAsyncReadyCallback)modem_power_down_ready,
result); task);
return; return;
} }
@@ -1180,7 +1176,7 @@ modem_power_down (MMIfaceModem *self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)modem_power_down_ready, (GAsyncReadyCallback)modem_power_down_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/