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

cinterion: port messaging_enable_unsolicited_events to GTask

Browse Source
This commit is contained in:
Aleksander Morgado
2017-09-20 17:19:32 -07:00
parent 7e478e408d
commit d09f9adafe
1 changed files with 61 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
plugins/cinterion/mm-broadband-modem-cinterion.c
View File

@@ -89,27 +89,25 @@ struct _MMBroadbandModemCinterionPrivate {
/* Enable unsolicited events (SMS indications) (Messaging interface) */ /* Enable unsolicited events (SMS indications) (Messaging interface) */
static gboolean static gboolean
messaging_enable_unsolicited_events_finish (MMIfaceModemMessaging *self, 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 void static void
cnmi_test_ready (MMBaseModem *self, cnmi_test_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
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))
if (error) g_task_return_error (task, error);
g_simple_async_result_take_error (simple, 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 gboolean static gboolean
@@ -130,84 +128,79 @@ value_supported (const GArray *array,
static void static void
messaging_enable_unsolicited_events (MMIfaceModemMessaging *_self, messaging_enable_unsolicited_events (MMIfaceModemMessaging *_self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
MMBroadbandModemCinterion *self = MM_BROADBAND_MODEM_CINTERION (_self); MMBroadbandModemCinterion *self = MM_BROADBAND_MODEM_CINTERION (_self);
GString *cmd; GString *cmd;
GError *error = NULL; GError *error = NULL;
GSimpleAsyncResult *simple; GTask *task;
simple = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
messaging_enable_unsolicited_events);
/* AT+CNMI=<mode>,[<mt>[,<bm>[,<ds>[,<bfr>]]]] */ /* AT+CNMI=<mode>,[<mt>[,<bm>[,<ds>[,<bfr>]]]] */
cmd = g_string_new ("+CNMI="); cmd = g_string_new ("+CNMI=");
/* Mode 2 or 1 */ /* Mode 2 or 1 */
if (!error) { if (value_supported (self->priv->cnmi_supported_mode, 2))
if (value_supported (self->priv->cnmi_supported_mode, 2)) g_string_append_printf (cmd, "%u,", 2);
g_string_append_printf (cmd, "%u,", 2); else if (value_supported (self->priv->cnmi_supported_mode, 1))
else if (value_supported (self->priv->cnmi_supported_mode, 1)) g_string_append_printf (cmd, "%u,", 1);
g_string_append_printf (cmd, "%u,", 1); else {
else error = g_error_new (MM_CORE_ERROR,
error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
MM_CORE_ERROR_FAILED, "SMS settings don't accept [2,1] <mode>");
"SMS settings don't accept [2,1] <mode>"); goto out;
} }
/* mt 2 or 1 */ /* mt 2 or 1 */
if (!error) { if (value_supported (self->priv->cnmi_supported_mt, 2))
if (value_supported (self->priv->cnmi_supported_mt, 2)) g_string_append_printf (cmd, "%u,", 2);
g_string_append_printf (cmd, "%u,", 2); else if (value_supported (self->priv->cnmi_supported_mt, 1))
else if (value_supported (self->priv->cnmi_supported_mt, 1)) g_string_append_printf (cmd, "%u,", 1);
g_string_append_printf (cmd, "%u,", 1); else {
else error = g_error_new (MM_CORE_ERROR,
error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
MM_CORE_ERROR_FAILED, "SMS settings don't accept [2,1] <mt>");
"SMS settings don't accept [2,1] <mt>"); goto out;
} }
/* bm 2 or 0 */ /* bm 2 or 0 */
if (!error) { if (value_supported (self->priv->cnmi_supported_bm, 2))
if (value_supported (self->priv->cnmi_supported_bm, 2)) g_string_append_printf (cmd, "%u,", 2);
g_string_append_printf (cmd, "%u,", 2); else if (value_supported (self->priv->cnmi_supported_bm, 0))
else if (value_supported (self->priv->cnmi_supported_bm, 0)) g_string_append_printf (cmd, "%u,", 0);
g_string_append_printf (cmd, "%u,", 0); else {
else error = g_error_new (MM_CORE_ERROR,
error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
MM_CORE_ERROR_FAILED, "SMS settings don't accept [2,0] <bm>");
"SMS settings don't accept [2,0] <bm>"); goto out;
} }
/* ds 2, 1 or 0 */ /* ds 2, 1 or 0 */
if (!error) { if (value_supported (self->priv->cnmi_supported_ds, 2))
if (value_supported (self->priv->cnmi_supported_ds, 2)) g_string_append_printf (cmd, "%u,", 2);
g_string_append_printf (cmd, "%u,", 2); else if (value_supported (self->priv->cnmi_supported_ds, 1))
else if (value_supported (self->priv->cnmi_supported_ds, 1)) g_string_append_printf (cmd, "%u,", 1);
g_string_append_printf (cmd, "%u,", 1); else if (value_supported (self->priv->cnmi_supported_ds, 0))
else if (value_supported (self->priv->cnmi_supported_ds, 0)) g_string_append_printf (cmd, "%u,", 0);
g_string_append_printf (cmd, "%u,", 0); else {
else error = g_error_new (MM_CORE_ERROR,
error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
MM_CORE_ERROR_FAILED, "SMS settings don't accept [2,1,0] <ds>");
"SMS settings don't accept [2,1,0] <ds>"); goto out;
} }
/* bfr 1 */ /* bfr 1 */
if (!error) { if (value_supported (self->priv->cnmi_supported_bfr, 1))
if (value_supported (self->priv->cnmi_supported_bfr, 1)) g_string_append_printf (cmd, "%u", 1);
g_string_append_printf (cmd, "%u", 1); /* otherwise, skip setting it */
/* otherwise, skip setting it */
}
out:
/* Early error report */ /* Early error report */
if (error) { if (error) {
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
g_simple_async_result_complete_in_idle (simple); g_object_unref (task);
g_object_unref (simple);
g_string_free (cmd, TRUE); g_string_free (cmd, TRUE);
return; return;
} }
@@ -217,7 +210,7 @@ messaging_enable_unsolicited_events (MMIfaceModemMessaging *_self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)cnmi_test_ready, (GAsyncReadyCallback)cnmi_test_ready,
simple); task);
g_string_free (cmd, TRUE); g_string_free (cmd, TRUE);
} }