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

mtk: port load_supported_modes to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-09-20 22:35:12 -07:00
committed by Aleksander Morgado
parent 2991ae0e86
commit 996612f8db
1 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
plugins/mtk/mm-broadband-modem-mtk.c
View File

@@ -180,7 +180,7 @@ modem_after_sim_unlock (MMIfaceModem *self,
static void static void
get_supported_modes_ready (MMBaseModem *self, get_supported_modes_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
const gchar *response; const gchar *response;
@@ -195,9 +195,8 @@ get_supported_modes_ready (MMBaseModem *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 ("Fail to get response %s", response); mm_dbg ("Fail to get response %s", response);
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
return; return;
} }
@@ -280,12 +279,8 @@ get_supported_modes_ready (MMBaseModem *self,
* +GCAP, +WS64 not support completely, generic filter will filter * +GCAP, +WS64 not support completely, generic filter will filter
* out 4G modes. * out 4G modes.
*/ */
g_simple_async_result_set_op_res_gpointer (simple, g_task_return_pointer (task, combinations, (GDestroyNotify)g_array_unref);
combinations, g_object_unref (task);
(GDestroyNotify)g_array_unref);
g_simple_async_result_complete (simple);
g_object_unref (simple);
g_regex_unref (r); g_regex_unref (r);
if (match_info) if (match_info)
@@ -298,17 +293,12 @@ load_supported_modes (MMIfaceModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
mm_base_modem_at_command ( mm_base_modem_at_command (MM_BASE_MODEM (self),
MM_BASE_MODEM (self), "+EGMR=0,0",
"+EGMR=0,0", 3,
3, FALSE,
FALSE, (GAsyncReadyCallback)get_supported_modes_ready,
(GAsyncReadyCallback)get_supported_modes_ready, g_task_new (self, NULL, callback, user_data));
g_simple_async_result_new (
G_OBJECT (self),
callback,
user_data,
load_supported_modes));
} }
static GArray * static GArray *
@@ -316,10 +306,7 @@ load_supported_modes_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 g_array_ref (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)));
} }
/*****************************************************************************/ /*****************************************************************************/