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

cinterion: port load_supported_bands to GTask

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

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

@@ -1151,17 +1151,13 @@ load_supported_bands_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) return g_task_propagate_pointer (G_TASK (res), error);
return NULL;
return (GArray *) g_array_ref (g_simple_async_result_get_op_res_gpointer (
G_SIMPLE_ASYNC_RESULT (res)));
} }
static void static void
scfg_test_ready (MMBaseModem *_self, scfg_test_ready (MMBaseModem *_self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
MMBroadbandModemCinterion *self = MM_BROADBAND_MODEM_CINTERION (_self); MMBroadbandModemCinterion *self = MM_BROADBAND_MODEM_CINTERION (_self);
const gchar *response; const gchar *response;
@@ -1169,21 +1165,18 @@ scfg_test_ready (MMBaseModem *_self,
GArray *bands; GArray *bands;
response = mm_base_modem_at_command_finish (_self, res, &error); response = mm_base_modem_at_command_finish (_self, res, &error);
if (!response) if (!response ||
g_simple_async_result_take_error (simple, error); !mm_cinterion_parse_scfg_test (response,
else if (!mm_cinterion_parse_scfg_test (response,
mm_broadband_modem_get_current_charset (MM_BROADBAND_MODEM (self)), mm_broadband_modem_get_current_charset (MM_BROADBAND_MODEM (self)),
&bands, &bands,
&error)) &error))
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
else { else {
mm_cinterion_build_band (bands, 0, FALSE, &self->priv->supported_bands, NULL); mm_cinterion_build_band (bands, 0, FALSE, &self->priv->supported_bands, NULL);
g_assert (self->priv->supported_bands != 0); g_assert (self->priv->supported_bands != 0);
g_simple_async_result_set_op_res_gpointer (simple, bands, (GDestroyNotify)g_array_unref); g_task_return_pointer (task, bands, (GDestroyNotify)g_array_unref);
} }
g_object_unref (task);
g_simple_async_result_complete (simple);
g_object_unref (simple);
} }
static void static void
@@ -1191,19 +1184,15 @@ load_supported_bands (MMIfaceModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *simple; GTask *task;
simple = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
load_supported_bands);
task = g_task_new (self, NULL, callback, user_data);
mm_base_modem_at_command (MM_BASE_MODEM (self), mm_base_modem_at_command (MM_BASE_MODEM (self),
"AT^SCFG=?", "AT^SCFG=?",
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)scfg_test_ready, (GAsyncReadyCallback)scfg_test_ready,
simple); task);
} }
/*****************************************************************************/ /*****************************************************************************/