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

nokia: port load_access_technologies to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-10-06 20:40:11 -07:00
committed by Aleksander Morgado
parent d4abf79e99
commit 6e68f4052b
1 changed files with 19 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
plugins/nokia/mm-broadband-modem-nokia.c
View File

@@ -75,20 +75,6 @@ typedef struct {
guint mask; guint mask;
} AccessTechInfo; } AccessTechInfo;
static void
access_tech_set_result (GSimpleAsyncResult *simple,
MMModemAccessTechnology act,
guint mask)
{
AccessTechInfo *info;
info = g_new (AccessTechInfo, 1);
info->act = act;
info->mask = mask;
g_simple_async_result_set_op_res_gpointer (simple, info, g_free);
}
static gboolean static gboolean
load_access_technologies_finish (MMIfaceModem *self, load_access_technologies_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
@@ -96,40 +82,41 @@ load_access_technologies_finish (MMIfaceModem *self,
guint *mask, guint *mask,
GError **error) GError **error)
{ {
AccessTechInfo *info; GError *inner_error = NULL;
gssize value;
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) value = g_task_propagate_int (G_TASK (res), &inner_error);
if (inner_error) {
g_propagate_error (error, inner_error);
return FALSE; return FALSE;
}
info = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)); *access_technologies = (MMModemAccessTechnology)value;
g_assert (info); *mask = MM_IFACE_MODEM_3GPP_ALL_ACCESS_TECHNOLOGIES_MASK;
*access_technologies = info->act;
*mask = info->mask;
return TRUE; return TRUE;
} }
static void static void
parent_load_access_technologies_ready (MMIfaceModem *self, parent_load_access_technologies_ready (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
MMModemAccessTechnology act = MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN; MMModemAccessTechnology act = MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN;
guint mask = 0; guint mask = 0;
GError *error = NULL; GError *error = NULL;
if (!iface_modem_parent->load_access_technologies_finish (self, res, &act, &mask, &error)) if (!iface_modem_parent->load_access_technologies_finish (self, res, &act, &mask, &error))
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
else else
access_tech_set_result (simple, act, MM_IFACE_MODEM_3GPP_ALL_ACCESS_TECHNOLOGIES_MASK); g_task_return_int (task, act);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
static void static void
access_tech_ready (MMBaseModem *self, access_tech_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
MMModemAccessTechnology act = MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN; MMModemAccessTechnology act = MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN;
const gchar *response, *p; const gchar *response, *p;
@@ -140,7 +127,7 @@ access_tech_ready (MMBaseModem *self,
iface_modem_parent->load_access_technologies ( iface_modem_parent->load_access_technologies (
MM_IFACE_MODEM (self), MM_IFACE_MODEM (self),
(GAsyncReadyCallback)parent_load_access_technologies_ready, (GAsyncReadyCallback)parent_load_access_technologies_ready,
simple); task);
return; return;
} }
@@ -150,17 +137,16 @@ access_tech_ready (MMBaseModem *self,
act = mm_string_to_access_tech (p + 1); act = mm_string_to_access_tech (p + 1);
if (act == MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN) if (act == MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN)
g_simple_async_result_set_error ( g_task_return_new_error (
simple, task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Couldn't parse access technologies result: '%s'", "Couldn't parse access technologies result: '%s'",
response); response);
else else
access_tech_set_result (simple, act, MM_IFACE_MODEM_3GPP_ALL_ACCESS_TECHNOLOGIES_MASK); g_task_return_int (task, act);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
static void static void
@@ -168,19 +154,12 @@ load_access_technologies (MMIfaceModem *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,
load_access_technologies);
mm_base_modem_at_command (MM_BASE_MODEM (self), mm_base_modem_at_command (MM_BASE_MODEM (self),
"*CNTI=0", "*CNTI=0",
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)access_tech_ready, (GAsyncReadyCallback)access_tech_ready,
result); g_task_new (self, NULL, callback, user_data));
} }
/*****************************************************************************/ /*****************************************************************************/