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

broadband-modem: port modem_load_own_numbers to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-07-06 15:05:52 -07:00
committed by Aleksander Morgado
parent a24a99e702
commit 738deebfb4
1 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1035,17 +1035,12 @@ modem_load_device_identifier (MMIfaceModem *self,
/* Load own numbers (Modem interface) */ /* Load own numbers (Modem interface) */
typedef struct { typedef struct {
MMBroadbandModem *self;
GSimpleAsyncResult *result;
MMPortSerialQcdm *qcdm; MMPortSerialQcdm *qcdm;
} OwnNumbersContext; } OwnNumbersContext;
static void static void
own_numbers_context_complete_and_free (OwnNumbersContext *ctx) own_numbers_context_free (OwnNumbersContext *ctx)
{ {
g_simple_async_result_complete (ctx->result);
g_object_unref (ctx->result);
g_object_unref (ctx->self);
if (ctx->qcdm) { if (ctx->qcdm) {
mm_port_serial_close (MM_PORT_SERIAL (ctx->qcdm)); mm_port_serial_close (MM_PORT_SERIAL (ctx->qcdm));
g_object_unref (ctx->qcdm); g_object_unref (ctx->qcdm);
@@ -1058,16 +1053,13 @@ modem_load_own_numbers_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_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
} }
static void static void
mdn_qcdm_ready (MMPortSerialQcdm *port, mdn_qcdm_ready (MMPortSerialQcdm *port,
GAsyncResult *res, GAsyncResult *res,
OwnNumbersContext *ctx) GTask *task)
{ {
QcdmResult *result; QcdmResult *result;
gint err = QCDM_SUCCESS; gint err = QCDM_SUCCESS;
@@ -1077,8 +1069,8 @@ mdn_qcdm_ready (MMPortSerialQcdm *port,
response = mm_port_serial_qcdm_command_finish (port, res, &error); response = mm_port_serial_qcdm_command_finish (port, res, &error);
if (error) { if (error) {
g_simple_async_result_take_error (ctx->result, error); g_task_return_error (task, error);
own_numbers_context_complete_and_free (ctx); g_object_unref (task);
return; return;
} }
@@ -1088,12 +1080,12 @@ mdn_qcdm_ready (MMPortSerialQcdm *port,
&err); &err);
g_byte_array_unref (response); g_byte_array_unref (response);
if (!result) { if (!result) {
g_simple_async_result_set_error (ctx->result, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Failed to parse NV MDN command result: %d", "Failed to parse NV MDN command result: %d",
err); err);
own_numbers_context_complete_and_free (ctx); g_object_unref (task);
return; return;
} }
@@ -1112,37 +1104,40 @@ mdn_qcdm_ready (MMPortSerialQcdm *port,
valid = g_ascii_isdigit (*p++) || (*p == '+'); valid = g_ascii_isdigit (*p++) || (*p == '+');
if (valid) { if (valid) {
g_simple_async_result_set_op_res_gpointer (ctx->result, g_task_return_pointer (task,
g_strdupv ((gchar **) numbers), g_strdupv ((gchar **) numbers),
NULL); (GDestroyNotify)g_strfreev);
} else { } else {
g_simple_async_result_set_error (ctx->result, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"%s", "%s",
"MDN from NV memory appears invalid"); "MDN from NV memory appears invalid");
} }
} else { } else {
g_simple_async_result_set_error (ctx->result, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"%s", "%s",
"Failed retrieve MDN"); "Failed retrieve MDN");
} }
g_object_unref (task);
qcdm_result_unref (result); qcdm_result_unref (result);
own_numbers_context_complete_and_free (ctx);
} }
static void static void
modem_load_own_numbers_done (MMIfaceModem *self, modem_load_own_numbers_done (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
OwnNumbersContext *ctx) GTask *task)
{ {
OwnNumbersContext *ctx;
const gchar *result; const gchar *result;
GError *error = NULL; GError *error = NULL;
GStrv numbers; GStrv numbers;
ctx = g_task_get_task_data (task);
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) {
/* try QCDM */ /* try QCDM */
@@ -1160,20 +1155,20 @@ modem_load_own_numbers_done (MMIfaceModem *self,
3, 3,
NULL, NULL,
(GAsyncReadyCallback)mdn_qcdm_ready, (GAsyncReadyCallback)mdn_qcdm_ready,
ctx); task);
g_byte_array_unref (mdn); g_byte_array_unref (mdn);
return; return;
} }
} else { } else {
numbers = mm_3gpp_parse_cnum_exec_response (result, &error); numbers = mm_3gpp_parse_cnum_exec_response (result, &error);
if (numbers) if (numbers)
g_simple_async_result_set_op_res_gpointer (ctx->result, numbers, NULL); g_task_return_pointer (task, numbers, (GDestroyNotify)g_strfreev);
} }
if (error) if (error)
g_simple_async_result_take_error (ctx->result, error); g_task_return_error (task, error);
own_numbers_context_complete_and_free (ctx); g_object_unref (task);
} }
static void static void
@@ -1183,13 +1178,9 @@ modem_load_own_numbers (MMIfaceModem *self,
{ {
OwnNumbersContext *ctx; OwnNumbersContext *ctx;
GError *error = NULL; GError *error = NULL;
GTask *task;
ctx = g_new0 (OwnNumbersContext, 1); ctx = g_new0 (OwnNumbersContext, 1);
ctx->self = g_object_ref (self);
ctx->result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
modem_load_own_numbers);
ctx->qcdm = mm_base_modem_peek_port_qcdm (MM_BASE_MODEM (self)); ctx->qcdm = mm_base_modem_peek_port_qcdm (MM_BASE_MODEM (self));
if (ctx->qcdm) { if (ctx->qcdm) {
if (mm_port_serial_open (MM_PORT_SERIAL (ctx->qcdm), &error)) { if (mm_port_serial_open (MM_PORT_SERIAL (ctx->qcdm), &error)) {
@@ -1202,13 +1193,16 @@ modem_load_own_numbers (MMIfaceModem *self,
} }
} }
task = g_task_new (self, NULL, callback, user_data);
g_task_set_task_data (task, ctx, (GDestroyNotify)own_numbers_context_free);
mm_dbg ("loading own numbers..."); mm_dbg ("loading own numbers...");
mm_base_modem_at_command (MM_BASE_MODEM (self), mm_base_modem_at_command (MM_BASE_MODEM (self),
"+CNUM", "+CNUM",
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)modem_load_own_numbers_done, (GAsyncReadyCallback)modem_load_own_numbers_done,
ctx); task);
} }
/*****************************************************************************/ /*****************************************************************************/