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

broadband-modem: port modem_messaging_enable_unsolicited_events to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-07-12 14:51:11 -07:00
committed by Aleksander Morgado
parent c270720e94
commit ed0c91b71b
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/mm-broadband-modem.c
View File

@@ -6136,7 +6136,7 @@ modem_messaging_enable_unsolicited_events_finish (MMIfaceModemMessaging *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
@@ -6180,7 +6180,7 @@ static const MMBaseModemAtCommand cnmi_sequence[] = {
static void static void
modem_messaging_enable_unsolicited_events_secondary_ready (MMBaseModem *self, modem_messaging_enable_unsolicited_events_secondary_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *final_result) GTask *task)
{ {
GError *inner_error = NULL; GError *inner_error = NULL;
MMPortSerialAt *secondary; MMPortSerialAt *secondary;
@@ -6199,14 +6199,14 @@ modem_messaging_enable_unsolicited_events_secondary_ready (MMBaseModem *self,
mm_dbg ("(%s) Messaging unsolicited events enabled on secondary", mm_dbg ("(%s) Messaging unsolicited events enabled on secondary",
mm_port_get_device (MM_PORT (secondary))); mm_port_get_device (MM_PORT (secondary)));
g_simple_async_result_complete (final_result); g_task_return_boolean (task, TRUE);
g_object_unref (final_result); g_object_unref (task);
} }
static void static void
modem_messaging_enable_unsolicited_events_primary_ready (MMBaseModem *self, modem_messaging_enable_unsolicited_events_primary_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *final_result) GTask *task)
{ {
GError *inner_error = NULL; GError *inner_error = NULL;
MMPortSerialAt *primary; MMPortSerialAt *primary;
@@ -6217,9 +6217,8 @@ modem_messaging_enable_unsolicited_events_primary_ready (MMBaseModem *self,
mm_base_modem_at_sequence_full_finish (MM_BASE_MODEM (self), res, NULL, &inner_error); mm_base_modem_at_sequence_full_finish (MM_BASE_MODEM (self), res, NULL, &inner_error);
if (inner_error) { if (inner_error) {
g_simple_async_result_take_error (final_result, inner_error); g_task_return_error (task, inner_error);
g_simple_async_result_complete (final_result); g_object_unref (task);
g_object_unref (final_result);
return; return;
} }
@@ -6238,12 +6237,12 @@ modem_messaging_enable_unsolicited_events_primary_ready (MMBaseModem *self,
NULL, /* response_processor_context_free */ NULL, /* response_processor_context_free */
NULL, NULL,
(GAsyncReadyCallback)modem_messaging_enable_unsolicited_events_secondary_ready, (GAsyncReadyCallback)modem_messaging_enable_unsolicited_events_secondary_ready,
final_result); task);
return; return;
} }
g_simple_async_result_complete (final_result); g_task_return_boolean (task, TRUE);
g_object_unref (final_result); g_object_unref (task);
} }
static void static void
@@ -6251,14 +6250,10 @@ modem_messaging_enable_unsolicited_events (MMIfaceModemMessaging *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
MMPortSerialAt *primary; MMPortSerialAt *primary;
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
modem_messaging_enable_unsolicited_events);
primary = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self)); primary = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
/* Enable unsolicited events for primary port */ /* Enable unsolicited events for primary port */
@@ -6272,7 +6267,7 @@ modem_messaging_enable_unsolicited_events (MMIfaceModemMessaging *self,
NULL, /* response_processor_context_free */ NULL, /* response_processor_context_free */
NULL, NULL,
(GAsyncReadyCallback)modem_messaging_enable_unsolicited_events_primary_ready, (GAsyncReadyCallback)modem_messaging_enable_unsolicited_events_primary_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/