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

simtech: port 3gpp_disable_unsolicited_events to GTask

Browse Source
This commit is contained in:
Aleksander Morgado
2017-09-13 16:30:51 +02:00
parent df4abdec15
commit e7fbf6fc56
1 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/simtech/mm-broadband-modem-simtech.c
View File

@@ -286,7 +286,7 @@ modem_3gpp_disable_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 const MMBaseModemAtCommand unsolicited_disable_sequence[] = { static const MMBaseModemAtCommand unsolicited_disable_sequence[] = {
@@ -298,30 +298,28 @@ static const MMBaseModemAtCommand unsolicited_disable_sequence[] = {
static void static void
parent_disable_unsolicited_events_ready (MMIfaceModem3gpp *self, parent_disable_unsolicited_events_ready (MMIfaceModem3gpp *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
if (!iface_modem_3gpp_parent->disable_unsolicited_events_finish (self, res, &error)) if (!iface_modem_3gpp_parent->disable_unsolicited_events_finish (self, res, &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
own_disable_unsolicited_events_ready (MMBaseModem *self, own_disable_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);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
return; return;
} }
@@ -329,7 +327,7 @@ own_disable_unsolicited_events_ready (MMBaseModem *self,
iface_modem_3gpp_parent->disable_unsolicited_events ( iface_modem_3gpp_parent->disable_unsolicited_events (
MM_IFACE_MODEM_3GPP (self), MM_IFACE_MODEM_3GPP (self),
(GAsyncReadyCallback)parent_disable_unsolicited_events_ready, (GAsyncReadyCallback)parent_disable_unsolicited_events_ready,
simple); task);
} }
static void static void
@@ -337,13 +335,6 @@ modem_3gpp_disable_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_disable_unsolicited_events);
/* Our own disable first */ /* Our own disable first */
mm_base_modem_at_sequence_full ( mm_base_modem_at_sequence_full (
MM_BASE_MODEM (self), MM_BASE_MODEM (self),
@@ -353,7 +344,7 @@ modem_3gpp_disable_unsolicited_events (MMIfaceModem3gpp *self,
NULL, /* response_processor_context_free */ NULL, /* response_processor_context_free */
NULL, /* cancellable */ NULL, /* cancellable */
(GAsyncReadyCallback)own_disable_unsolicited_events_ready, (GAsyncReadyCallback)own_disable_unsolicited_events_ready,
result); g_task_new (self, NULL, callback, user_data));
} }
/*****************************************************************************/ /*****************************************************************************/