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

novatel-lte: port load_current_bands to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-09-12 08:34:41 -07:00
committed by Aleksander Morgado
parent eb59cf8617
commit d8be23b606
1 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/novatel/mm-broadband-modem-novatel-lte.c
View File

@@ -347,17 +347,13 @@ load_current_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
load_current_bands_done (MMIfaceModem *self, load_current_bands_done (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *operation_result) GTask *task)
{ {
GArray *bands; GArray *bands;
const gchar *response; const gchar *response;
@@ -368,9 +364,8 @@ load_current_bands_done (MMIfaceModem *self,
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) {
mm_dbg ("Couldn't query supported bands: '%s'", error->message); mm_dbg ("Couldn't query supported bands: '%s'", error->message);
g_simple_async_result_take_error (operation_result, error); g_task_return_error (task, error);
g_simple_async_result_complete_in_idle (operation_result); g_object_unref (task);
g_object_unref (operation_result);
return; return;
} }
@@ -386,11 +381,8 @@ load_current_bands_done (MMIfaceModem *self,
g_array_append_val(bands, bandbits[i]); g_array_append_val(bands, bandbits[i]);
} }
g_simple_async_result_set_op_res_gpointer (operation_result, g_task_return_pointer (task, bands, (GDestroyNotify)g_array_unref);
bands, g_object_unref (task);
(GDestroyNotify)g_array_unref);
g_simple_async_result_complete_in_idle (operation_result);
g_object_unref (operation_result);
} }
static void static void
@@ -398,20 +390,13 @@ load_current_bands (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_current_bands);
mm_base_modem_at_command ( mm_base_modem_at_command (
MM_BASE_MODEM (self), MM_BASE_MODEM (self),
"$NWBAND?", "$NWBAND?",
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)load_current_bands_done, (GAsyncReadyCallback)load_current_bands_done,
result); g_task_new (self, NULL, callback, user_data));
} }
/*****************************************************************************/ /*****************************************************************************/