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

sierra: port mm_common_sierra_load_power_state to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-09-08 13:26:33 -07:00
committed by Aleksander Morgado
parent 1eb51d96f7
commit 043645ea57
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
plugins/sierra/mm-common-sierra.c
View File

@@ -350,33 +350,38 @@ mm_common_sierra_load_power_state_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) GError *inner_error = NULL;
return MM_MODEM_POWER_STATE_UNKNOWN; gssize value;
return (MMModemPowerState)GPOINTER_TO_UINT (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res))); value = g_task_propagate_int (G_TASK (res), &inner_error);
if (inner_error) {
g_propagate_error (error, inner_error);
return MM_MODEM_POWER_STATE_UNKNOWN;
}
return (MMModemPowerState)value;
} }
static void static void
parent_load_power_state_ready (MMIfaceModem *self, parent_load_power_state_ready (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
MMModemPowerState state; MMModemPowerState state;
state = iface_modem_parent->load_power_state_finish (self, res, &error); state = iface_modem_parent->load_power_state_finish (self, res, &error);
if (error) if (error)
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
else else
g_simple_async_result_set_op_res_gpointer (simple, GUINT_TO_POINTER (state), NULL); g_task_return_int (task, state);
g_simple_async_result_complete (simple);
g_object_unref (simple); g_object_unref (task);
} }
static void static void
pcstate_query_ready (MMBaseModem *self, pcstate_query_ready (MMBaseModem *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
const gchar *result; const gchar *result;
guint state; guint state;
@@ -384,16 +389,15 @@ pcstate_query_ready (MMBaseModem *self,
result = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error); result = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error);
if (!result) { if (!result) {
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;
} }
/* Parse power state reply */ /* Parse power state reply */
result = mm_strip_tag (result, "!PCSTATE:"); result = mm_strip_tag (result, "!PCSTATE:");
if (!mm_get_uint_from_str (result, &state)) { if (!mm_get_uint_from_str (result, &state)) {
g_simple_async_result_set_error (simple, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Failed to parse !PCSTATE response '%s'", "Failed to parse !PCSTATE response '%s'",
@@ -401,13 +405,13 @@ pcstate_query_ready (MMBaseModem *self,
} else { } else {
switch (state) { switch (state) {
case 0: case 0:
g_simple_async_result_set_op_res_gpointer (simple, GUINT_TO_POINTER (MM_MODEM_POWER_STATE_LOW), NULL); g_task_return_int (task, MM_MODEM_POWER_STATE_LOW);
break; break;
case 1: case 1:
g_simple_async_result_set_op_res_gpointer (simple, GUINT_TO_POINTER (MM_MODEM_POWER_STATE_ON), NULL); g_task_return_int (task, MM_MODEM_POWER_STATE_ON);
break; break;
default: default:
g_simple_async_result_set_error (simple, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Unhandled power state: '%u'", "Unhandled power state: '%u'",
@@ -416,8 +420,7 @@ pcstate_query_ready (MMBaseModem *self,
} }
} }
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
void void
@@ -425,12 +428,9 @@ mm_common_sierra_load_power_state (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,
mm_common_sierra_load_power_state);
/* Check power state with AT!PCSTATE? */ /* Check power state with AT!PCSTATE? */
if (mm_iface_modem_is_cdma_only (self)) { if (mm_iface_modem_is_cdma_only (self)) {
@@ -439,14 +439,14 @@ mm_common_sierra_load_power_state (MMIfaceModem *self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)pcstate_query_ready, (GAsyncReadyCallback)pcstate_query_ready,
result); task);
return; return;
} }
/* Otherwise run parent's */ /* Otherwise run parent's */
iface_modem_parent->load_power_state (self, iface_modem_parent->load_power_state (self,
(GAsyncReadyCallback)parent_load_power_state_ready, (GAsyncReadyCallback)parent_load_power_state_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/