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

sierra: port load_sim_identifier to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-09-08 13:05:39 -07:00
committed by Aleksander Morgado
parent 5ffc3b7a92
commit 8fb6f30f49
1 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
plugins/sierra/mm-sim-sierra.c
View File

@@ -41,20 +41,13 @@ load_sim_identifier_finish (MMBaseSim *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
gchar *iccid; return g_task_propagate_pointer (G_TASK (res), error);
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
return NULL;
iccid = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
mm_dbg ("loaded SIM identifier: %s", iccid);
return g_strdup (iccid);
} }
static void static void
iccid_read_ready (MMBaseModem *modem, iccid_read_ready (MMBaseModem *modem,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
const gchar *response; const gchar *response;
@@ -64,32 +57,29 @@ iccid_read_ready (MMBaseModem *modem,
response = mm_base_modem_at_command_finish (modem, res, &error); response = mm_base_modem_at_command_finish (modem, res, &error);
if (!response) { if (!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;
} }
p = mm_strip_tag (response, "!ICCID:"); p = mm_strip_tag (response, "!ICCID:");
if (!p) { if (!p) {
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 !ICCID response: '%s'", "Failed to parse !ICCID response: '%s'",
response); response);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
return; return;
} }
parsed = mm_3gpp_parse_iccid (p, &local); parsed = mm_3gpp_parse_iccid (p, &local);
if (parsed) if (parsed)
g_simple_async_result_set_op_res_gpointer (simple, parsed, g_free); g_task_return_pointer (task, parsed, g_free);
else else
g_simple_async_result_take_error (simple, local); g_task_return_error (task, local);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
static void static void
@@ -98,11 +88,14 @@ load_sim_identifier (MMBaseSim *self,
gpointer user_data) gpointer user_data)
{ {
MMBaseModem *modem = NULL; MMBaseModem *modem = NULL;
GTask *task;
g_object_get (self, g_object_get (self,
MM_BASE_SIM_MODEM, &modem, MM_BASE_SIM_MODEM, &modem,
NULL); NULL);
task = g_task_new (self, NULL, callback, user_data);
mm_dbg ("loading (Sierra) SIM identifier..."); mm_dbg ("loading (Sierra) SIM identifier...");
mm_base_modem_at_command ( mm_base_modem_at_command (
modem, modem,
@@ -110,10 +103,7 @@ load_sim_identifier (MMBaseSim *self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)iccid_read_ready, (GAsyncReadyCallback)iccid_read_ready,
g_simple_async_result_new (G_OBJECT (self), task);
callback,
user_data,
load_sim_identifier));
g_object_unref (modem); g_object_unref (modem);
} }