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

broadband-modem: port modem_cdma_get_service_status to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-07-12 14:57:02 -07:00
committed by Aleksander Morgado
parent 610a6299e1
commit e040ee27a0
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/mm-broadband-modem.c
View File

@@ -7572,42 +7572,46 @@ modem_cdma_get_service_status_finish (MMIfaceModemCdma *self,
gboolean *has_cdma_service, gboolean *has_cdma_service,
GError **error) GError **error)
{ {
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) GError *inner_error = NULL;
return FALSE; gboolean value;
*has_cdma_service = g_simple_async_result_get_op_res_gboolean (G_SIMPLE_ASYNC_RESULT (res)); value = g_task_propagate_boolean (G_TASK (res), error);
if (inner_error) {
g_propagate_error (error, inner_error);
return FALSE;
}
*has_cdma_service = value;
return TRUE; return TRUE;
} }
static void static void
cad_query_ready (MMIfaceModemCdma *self, cad_query_ready (MMIfaceModemCdma *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
const gchar *result; const gchar *result;
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 (error) if (error)
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
else { else {
guint cad; guint cad;
/* Strip any leading command tag and spaces */ /* Strip any leading command tag and spaces */
result = mm_strip_tag (result, "+CAD:"); result = mm_strip_tag (result, "+CAD:");
if (!mm_get_uint_from_str (result, &cad)) if (!mm_get_uint_from_str (result, &cad))
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 +CAD response '%s'", "Failed to parse +CAD response '%s'",
result); result);
else else
/* 1 == CDMA service */ /* 1 == CDMA service */
g_simple_async_result_set_op_res_gboolean (simple, (cad == 1)); g_task_return_boolean (task, (cad == 1));
} }
g_object_unref (task);
g_simple_async_result_complete (simple);
g_object_unref (simple);
} }
static void static void
@@ -7615,19 +7619,16 @@ modem_cdma_get_service_status (MMIfaceModemCdma *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,
modem_cdma_get_service_status);
mm_base_modem_at_command (MM_BASE_MODEM (self), mm_base_modem_at_command (MM_BASE_MODEM (self),
"+CAD?", "+CAD?",
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)cad_query_ready, (GAsyncReadyCallback)cad_query_ready,
result); task);
} }
/*****************************************************************************/ /*****************************************************************************/