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

huawei: port sysinfo to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-07-18 00:48:21 -07:00
committed by Aleksander Morgado
parent 833243570f
commit 8b9402da2b
1 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
plugins/huawei/mm-broadband-modem-huawei.c
View File

@@ -205,11 +205,10 @@ sysinfo_finish (MMBroadbandModemHuawei *self,
{ {
SysinfoResult *result; SysinfoResult *result;
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) result = g_task_propagate_pointer (G_TASK (res), error);
if (!result)
return FALSE; return FALSE;
result = (SysinfoResult *) g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
if (extended) if (extended)
*extended = result->extended; *extended = result->extended;
if (srv_status) if (srv_status)
@@ -227,13 +226,14 @@ sysinfo_finish (MMBroadbandModemHuawei *self,
if (sys_submode) if (sys_submode)
*sys_submode = result->sys_submode; *sys_submode = result->sys_submode;
g_free (result);
return TRUE; return TRUE;
} }
static void static void
run_sysinfo_ready (MMBaseModem *self, run_sysinfo_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
const gchar *response; const gchar *response;
@@ -242,9 +242,8 @@ run_sysinfo_ready (MMBaseModem *self,
response = mm_base_modem_at_command_finish (self, res, &error); response = mm_base_modem_at_command_finish (self, res, &error);
if (!response) { if (!response) {
mm_dbg ("^SYSINFO failed: %s", error->message); mm_dbg ("^SYSINFO failed: %s", error->message);
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;
} }
@@ -260,34 +259,32 @@ run_sysinfo_ready (MMBaseModem *self,
&result->sys_submode, &result->sys_submode,
&error)) { &error)) {
mm_dbg ("^SYSINFO parsing failed: %s", error->message); mm_dbg ("^SYSINFO parsing failed: %s", error->message);
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);
g_free (result); g_free (result);
return; return;
} }
g_simple_async_result_set_op_res_gpointer (simple, result, g_free); g_task_return_pointer (task, result, g_free);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
static void static void
run_sysinfo (MMBroadbandModemHuawei *self, run_sysinfo (MMBroadbandModemHuawei *self,
GSimpleAsyncResult *result) GTask *task)
{ {
mm_base_modem_at_command (MM_BASE_MODEM (self), mm_base_modem_at_command (MM_BASE_MODEM (self),
"^SYSINFO", "^SYSINFO",
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)run_sysinfo_ready, (GAsyncReadyCallback)run_sysinfo_ready,
result); task);
} }
static void static void
run_sysinfoex_ready (MMBaseModem *_self, run_sysinfoex_ready (MMBaseModem *_self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
MMBroadbandModemHuawei *self = MM_BROADBAND_MODEM_HUAWEI (_self); MMBroadbandModemHuawei *self = MM_BROADBAND_MODEM_HUAWEI (_self);
GError *error = NULL; GError *error = NULL;
@@ -301,15 +298,14 @@ run_sysinfoex_ready (MMBaseModem *_self,
self->priv->sysinfoex_support = FEATURE_NOT_SUPPORTED; self->priv->sysinfoex_support = FEATURE_NOT_SUPPORTED;
mm_dbg ("^SYSINFOEX failed: %s, assuming unsupported", error->message); mm_dbg ("^SYSINFOEX failed: %s, assuming unsupported", error->message);
g_error_free (error); g_error_free (error);
run_sysinfo (self, simple); run_sysinfo (self, task);
return; return;
} }
/* Otherwise, propagate error */ /* Otherwise, propagate error */
mm_dbg ("^SYSINFOEX failed: %s", error->message); mm_dbg ("^SYSINFOEX failed: %s", error->message);
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;
} }
@@ -327,30 +323,28 @@ run_sysinfoex_ready (MMBaseModem *_self,
&result->sys_submode, &result->sys_submode,
&error)) { &error)) {
mm_dbg ("^SYSINFOEX parsing failed: %s", error->message); mm_dbg ("^SYSINFOEX parsing failed: %s", error->message);
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);
g_free (result); g_free (result);
return; return;
} }
/* Submode from SYSINFOEX always valid */ /* Submode from SYSINFOEX always valid */
result->sys_submode_valid = TRUE; result->sys_submode_valid = TRUE;
g_simple_async_result_set_op_res_gpointer (simple, result, g_free); g_task_return_pointer (task, result, g_free);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
static void static void
run_sysinfoex (MMBroadbandModemHuawei *self, run_sysinfoex (MMBroadbandModemHuawei *self,
GSimpleAsyncResult *result) GTask *task)
{ {
mm_base_modem_at_command (MM_BASE_MODEM (self), mm_base_modem_at_command (MM_BASE_MODEM (self),
"^SYSINFOEX", "^SYSINFOEX",
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)run_sysinfoex_ready, (GAsyncReadyCallback)run_sysinfoex_ready,
result); task);
} }
static void static void
@@ -358,17 +352,15 @@ sysinfo (MMBroadbandModemHuawei *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
task = g_task_new (self, NULL, callback, user_data);
result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
sysinfo);
if (self->priv->sysinfoex_support == FEATURE_SUPPORT_UNKNOWN || if (self->priv->sysinfoex_support == FEATURE_SUPPORT_UNKNOWN ||
self->priv->sysinfoex_support == FEATURE_SUPPORTED) self->priv->sysinfoex_support == FEATURE_SUPPORTED)
run_sysinfoex (self, result); run_sysinfoex (self, task);
else else
run_sysinfo (self, result); run_sysinfo (self, task);
} }
/*****************************************************************************/ /*****************************************************************************/