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

cinterion: port register_in_network to GTask

Browse Source
This commit is contained in:
Aleksander Morgado
2017-09-20 21:36:10 -07:00
parent f9e2ebf3a0
commit 7f2520a83d
1 changed files with 23 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1086,47 +1086,30 @@ set_current_modes (MMIfaceModem *_self,
/*****************************************************************************/ /*****************************************************************************/
/* Register in network (3GPP interface) */ /* Register in network (3GPP interface) */
typedef struct {
MMBroadbandModemCinterion *self;
GSimpleAsyncResult *result;
gchar *operator_id;
} RegisterInNetworkContext;
static void
register_in_network_context_complete_and_free (RegisterInNetworkContext *ctx)
{
g_simple_async_result_complete (ctx->result);
g_object_unref (ctx->result);
g_object_unref (ctx->self);
g_free (ctx->operator_id);
g_slice_free (RegisterInNetworkContext, ctx);
}
static gboolean static gboolean
register_in_network_finish (MMIfaceModem3gpp *self, register_in_network_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
cops_write_ready (MMBaseModem *self, cops_write_ready (MMBaseModem *_self,
GAsyncResult *res, GAsyncResult *res,
RegisterInNetworkContext *ctx) GTask *task)
{ {
MMBroadbandModemCinterion *self = MM_BROADBAND_MODEM_CINTERION (_self);
GError *error = NULL; GError *error = NULL;
if (!mm_base_modem_at_command_full_finish (MM_BASE_MODEM (self), res, &error)) if (!mm_base_modem_at_command_full_finish (_self, res, &error))
g_simple_async_result_take_error (ctx->result, error); g_task_return_error (task, error);
else { else {
/* Update cached */ g_free (self->priv->manual_operator_id);
g_free (ctx->self->priv->manual_operator_id); self->priv->manual_operator_id = g_strdup (g_task_get_task_data (task));
ctx->self->priv->manual_operator_id = g_strdup (ctx->operator_id); g_task_return_boolean (task, TRUE);
g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
} }
g_object_unref (task);
register_in_network_context_complete_and_free (ctx);
} }
static void static void
@@ -1136,16 +1119,11 @@ register_in_network (MMIfaceModem3gpp *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
RegisterInNetworkContext *ctx; GTask *task;
gchar *command; gchar *command;
ctx = g_slice_new (RegisterInNetworkContext); task = g_task_new (self, cancellable, callback, user_data);
ctx->self = g_object_ref (self); g_task_set_task_data (task, g_strdup (operator_id), g_free);
ctx->operator_id = g_strdup (operator_id);
ctx->result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
register_in_network);
/* If the user sent a specific network to use, lock it in. */ /* If the user sent a specific network to use, lock it in. */
if (operator_id) if (operator_id)
@@ -1161,7 +1139,7 @@ register_in_network (MMIfaceModem3gpp *self,
FALSE, /* raw */ FALSE, /* raw */
cancellable, cancellable,
(GAsyncReadyCallback)cops_write_ready, (GAsyncReadyCallback)cops_write_ready,
ctx); task);
g_free (command); g_free (command);
} }