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

simtech: port load_access_technologies to GTask

Browse Source
This commit is contained in:
Aleksander Morgado
2017-09-13 16:25:29 +02:00
parent cda7deea3d
commit df4abdec15
1 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -360,36 +360,38 @@ modem_3gpp_disable_unsolicited_events (MMIfaceModem3gpp *self,
/* Load access technologies (Modem interface) */ /* Load access technologies (Modem interface) */
static gboolean static gboolean
load_access_technologies_finish (MMIfaceModem *self, load_access_technologies_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
MMModemAccessTechnology *access_technologies, MMModemAccessTechnology *access_technologies,
guint *mask, guint *mask,
GError **error) GError **error)
{ {
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) GError *inner_error = NULL;
return FALSE; gssize act;
*access_technologies = (MMModemAccessTechnology) GPOINTER_TO_UINT ( act = g_task_propagate_int (G_TASK (res), &inner_error);
g_simple_async_result_get_op_res_gpointer ( if (inner_error) {
G_SIMPLE_ASYNC_RESULT (res))); g_propagate_error (error, inner_error);
return FALSE;
}
*access_technologies = (MMModemAccessTechnology) act;
*mask = MM_MODEM_ACCESS_TECHNOLOGY_ANY; *mask = MM_MODEM_ACCESS_TECHNOLOGY_ANY;
return TRUE; return TRUE;
} }
static void static void
cnsmod_query_ready (MMBroadbandModemSimtech *self, cnsmod_query_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *operation_result) GTask *task)
{ {
const gchar *response, *p; const gchar *response, *p;
GError *error = NULL; GError *error = NULL;
response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error); response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error);
if (!response) { if (!response) {
/* Let the error be critical. */ g_task_return_error (task, error);
g_simple_async_result_take_error (operation_result, error); g_object_unref (task);
g_simple_async_result_complete (operation_result);
g_object_unref (operation_result);
return; return;
} }
@@ -398,42 +400,30 @@ cnsmod_query_ready (MMBroadbandModemSimtech *self,
p = strchr (p, ','); p = strchr (p, ',');
if (!p || !isdigit (*(p + 1))) if (!p || !isdigit (*(p + 1)))
g_simple_async_result_set_error ( g_task_return_new_error (
operation_result, task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Failed to parse the +CNSMOD response: '%s'", "Failed to parse the +CNSMOD response: '%s'",
response); response);
else else
g_simple_async_result_set_op_res_gpointer ( g_task_return_int (task, simtech_act_to_mm_act (atoi (p + 1)));
operation_result, g_object_unref (task);
GUINT_TO_POINTER (simtech_act_to_mm_act (atoi (p + 1))),
NULL);
g_simple_async_result_complete (operation_result);
g_object_unref (operation_result);
} }
static void static void
load_access_technologies (MMIfaceModem *self, load_access_technologies (MMIfaceModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
load_access_technologies);
/* Launch query only for 3GPP modems */ /* Launch query only for 3GPP modems */
if (!mm_iface_modem_is_3gpp (self)) { if (!mm_iface_modem_is_3gpp (self)) {
g_simple_async_result_set_op_res_gpointer ( g_task_return_int (task, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN);
result, g_object_unref (task);
GUINT_TO_POINTER (MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN),
NULL);
g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
return; return;
} }
@@ -443,7 +433,7 @@ load_access_technologies (MMIfaceModem *self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)cnsmod_query_ready, (GAsyncReadyCallback)cnsmod_query_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/