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

mtk: port enable_unsolicited_events to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-09-20 23:15:46 -07:00
committed by Aleksander Morgado
parent bfac21fbb8
commit fe58e5f498
1 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
plugins/mtk/mm-broadband-modem-mtk.c
View File

@@ -742,41 +742,39 @@ static const MMBaseModemAtCommand unsolicited_disable_sequence[] = {
static void static void
own_enable_unsolicited_events_ready (MMBaseModem *self, own_enable_unsolicited_events_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
mm_base_modem_at_sequence_full_finish (self, res, NULL, &error); mm_base_modem_at_sequence_full_finish (self, res, NULL, &error);
if (error) if (error)
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 void static void
parent_enable_unsolicited_events_ready (MMIfaceModem3gpp *self, parent_enable_unsolicited_events_ready (MMIfaceModem3gpp *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
if (!iface_modem_3gpp_parent->enable_unsolicited_events_finish (self, res, &error)) { if (!iface_modem_3gpp_parent->enable_unsolicited_events_finish (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);
} }
/* Our own enable now */ /* Our own enable now */
mm_base_modem_at_sequence_full ( mm_base_modem_at_sequence_full (
MM_BASE_MODEM (self), MM_BASE_MODEM (self),
mm_base_modem_peek_port_primary (MM_BASE_MODEM (self)), mm_base_modem_peek_port_primary (MM_BASE_MODEM (self)),
unsolicited_enable_sequence, unsolicited_enable_sequence,
NULL,NULL,NULL, NULL,NULL,NULL,
(GAsyncReadyCallback)own_enable_unsolicited_events_ready, (GAsyncReadyCallback)own_enable_unsolicited_events_ready,
simple); task);
} }
static void static void
@@ -784,18 +782,11 @@ modem_3gpp_enable_unsolicited_events (MMIfaceModem3gpp *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result;
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
modem_3gpp_enable_unsolicited_events);
/* Chain up parent's enable */ /* Chain up parent's enable */
iface_modem_3gpp_parent->enable_unsolicited_events ( iface_modem_3gpp_parent->enable_unsolicited_events (
self, self,
(GAsyncReadyCallback)parent_enable_unsolicited_events_ready, (GAsyncReadyCallback)parent_enable_unsolicited_events_ready,
result); g_task_new (self, NULL, callback, user_data));
} }
static gboolean static gboolean
@@ -803,7 +794,7 @@ modem_3gpp_enable_unsolicited_events_finish (MMIfaceModem3gpp *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