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

broadband-modem-qmi: port modem_3gpp_{enable,disable}_unsolicited_registration_events to use GTask

Browse Source
This commit is contained in:
Ben Chan
2018-05-01 14:13:01 -07:00
committed by Aleksander Morgado
parent 478232dc05
commit d73f431987
1 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/mm-broadband-modem-qmi.c
View File

@@ -5155,40 +5155,35 @@ modem_3gpp_run_registration_checks (MMIfaceModem3gpp *self,
/* Enable/Disable unsolicited registration events (3GPP interface) */ /* Enable/Disable unsolicited registration events (3GPP interface) */
typedef struct { typedef struct {
MMBroadbandModemQmi *self;
QmiClientNas *client; QmiClientNas *client;
GSimpleAsyncResult *result;
gboolean enable; /* TRUE for enabling, FALSE for disabling */ gboolean enable; /* TRUE for enabling, FALSE for disabling */
} UnsolicitedRegistrationEventsContext; } UnsolicitedRegistrationEventsContext;
static void static void
unsolicited_registration_events_context_complete_and_free (UnsolicitedRegistrationEventsContext *ctx) unsolicited_registration_events_context_free (UnsolicitedRegistrationEventsContext *ctx)
{ {
g_simple_async_result_complete_in_idle (ctx->result);
g_object_unref (ctx->result);
g_object_unref (ctx->client); g_object_unref (ctx->client);
g_object_unref (ctx->self);
g_free (ctx); g_free (ctx);
} }
static UnsolicitedRegistrationEventsContext * static GTask *
unsolicited_registration_events_context_new (MMBroadbandModemQmi *self, unsolicited_registration_events_task_new (MMBroadbandModemQmi *self,
QmiClient *client, QmiClient *client,
gboolean enable, gboolean enable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
UnsolicitedRegistrationEventsContext *ctx; UnsolicitedRegistrationEventsContext *ctx;
GTask *task;
ctx = g_new0 (UnsolicitedRegistrationEventsContext, 1); ctx = g_new0 (UnsolicitedRegistrationEventsContext, 1);
ctx->self = g_object_ref (self);
ctx->client = g_object_ref (client); ctx->client = g_object_ref (client);
ctx->result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
unsolicited_registration_events_context_new);
ctx->enable = enable; ctx->enable = enable;
return ctx;
task = g_task_new (self, NULL, callback, user_data);
g_task_set_task_data (task, ctx, (GDestroyNotify)unsolicited_registration_events_context_free);
return task;
} }
static gboolean static gboolean
@@ -5196,17 +5191,22 @@ modem_3gpp_enable_disable_unsolicited_registration_events_finish (MMIfaceModem3g
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); return g_task_propagate_boolean (G_TASK (res), error);
} }
static void static void
ri_serving_system_or_system_info_ready (QmiClientNas *client, ri_serving_system_or_system_info_ready (QmiClientNas *client,
GAsyncResult *res, GAsyncResult *res,
UnsolicitedRegistrationEventsContext *ctx) GTask *task)
{ {
MMBroadbandModemQmi *self;
UnsolicitedRegistrationEventsContext *ctx;
QmiMessageNasRegisterIndicationsOutput *output = NULL; QmiMessageNasRegisterIndicationsOutput *output = NULL;
GError *error = NULL; GError *error = NULL;
self = g_task_get_source_object (task);
ctx = g_task_get_task_data (task);
output = qmi_client_nas_register_indications_finish (client, res, &error); output = qmi_client_nas_register_indications_finish (client, res, &error);
if (!output) { if (!output) {
mm_dbg ("QMI operation failed: '%s'", error->message); mm_dbg ("QMI operation failed: '%s'", error->message);
@@ -5220,16 +5220,18 @@ ri_serving_system_or_system_info_ready (QmiClientNas *client,
qmi_message_nas_register_indications_output_unref (output); qmi_message_nas_register_indications_output_unref (output);
/* Just ignore errors for now */ /* Just ignore errors for now */
ctx->self->priv->unsolicited_registration_events_enabled = ctx->enable; self->priv->unsolicited_registration_events_enabled = ctx->enable;
g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); g_task_return_boolean (task, TRUE);
unsolicited_registration_events_context_complete_and_free (ctx); g_object_unref (task);
} }
static void static void
common_enable_disable_unsolicited_registration_events_serving_system (UnsolicitedRegistrationEventsContext *ctx) common_enable_disable_unsolicited_registration_events_serving_system (GTask *task)
{ {
UnsolicitedRegistrationEventsContext *ctx;
QmiMessageNasRegisterIndicationsInput *input; QmiMessageNasRegisterIndicationsInput *input;
ctx = g_task_get_task_data (task);
input = qmi_message_nas_register_indications_input_new (); input = qmi_message_nas_register_indications_input_new ();
qmi_message_nas_register_indications_input_set_serving_system_events (input, ctx->enable, NULL); qmi_message_nas_register_indications_input_set_serving_system_events (input, ctx->enable, NULL);
qmi_client_nas_register_indications ( qmi_client_nas_register_indications (
@@ -5238,16 +5240,18 @@ common_enable_disable_unsolicited_registration_events_serving_system (Unsolicite
5, 5,
NULL, NULL,
(GAsyncReadyCallback)ri_serving_system_or_system_info_ready, (GAsyncReadyCallback)ri_serving_system_or_system_info_ready,
ctx); task);
qmi_message_nas_register_indications_input_unref (input); qmi_message_nas_register_indications_input_unref (input);
} }
#if defined WITH_NEWEST_QMI_COMMANDS #if defined WITH_NEWEST_QMI_COMMANDS
static void static void
common_enable_disable_unsolicited_registration_events_system_info (UnsolicitedRegistrationEventsContext *ctx) common_enable_disable_unsolicited_registration_events_system_info (GTask *task)
{ {
UnsolicitedRegistrationEventsContext *ctx;
QmiMessageNasRegisterIndicationsInput *input; QmiMessageNasRegisterIndicationsInput *input;
ctx = g_task_get_task_data (task);
input = qmi_message_nas_register_indications_input_new (); input = qmi_message_nas_register_indications_input_new ();
qmi_message_nas_register_indications_input_set_system_info (input, ctx->enable, NULL); qmi_message_nas_register_indications_input_set_system_info (input, ctx->enable, NULL);
qmi_client_nas_register_indications ( qmi_client_nas_register_indications (
@@ -5256,28 +5260,29 @@ common_enable_disable_unsolicited_registration_events_system_info (UnsolicitedRe
5, 5,
NULL, NULL,
(GAsyncReadyCallback)ri_serving_system_or_system_info_ready, (GAsyncReadyCallback)ri_serving_system_or_system_info_ready,
ctx); task);
qmi_message_nas_register_indications_input_unref (input); qmi_message_nas_register_indications_input_unref (input);
} }
#endif /* WITH_NEWEST_QMI_COMMANDS */ #endif /* WITH_NEWEST_QMI_COMMANDS */
static void static void
modem_3gpp_disable_unsolicited_registration_events (MMIfaceModem3gpp *self, modem_3gpp_disable_unsolicited_registration_events (MMIfaceModem3gpp *_self,
gboolean cs_supported, gboolean cs_supported,
gboolean ps_supported, gboolean ps_supported,
gboolean eps_supported, gboolean eps_supported,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
UnsolicitedRegistrationEventsContext *ctx; MMBroadbandModemQmi *self = MM_BROADBAND_MODEM_QMI (_self);
GTask *task;
QmiClient *client = NULL; QmiClient *client = NULL;
if (!ensure_qmi_client (MM_BROADBAND_MODEM_QMI (self), if (!assure_qmi_client (MM_BROADBAND_MODEM_QMI (self),
QMI_SERVICE_NAS, &client, QMI_SERVICE_NAS, &client,
callback, user_data)) callback, user_data))
return; return;
ctx = unsolicited_registration_events_context_new (MM_BROADBAND_MODEM_QMI (self), task = unsolicited_registration_events_task_new (self,
client, client,
FALSE, FALSE,
callback, callback,
@@ -5286,7 +5291,7 @@ modem_3gpp_disable_unsolicited_registration_events (MMIfaceModem3gpp *self,
#if defined WITH_NEWEST_QMI_COMMANDS #if defined WITH_NEWEST_QMI_COMMANDS
/* System Info was added in NAS 1.8 */ /* System Info was added in NAS 1.8 */
if (qmi_client_check_version (client, 1, 8)) { if (qmi_client_check_version (client, 1, 8)) {
common_enable_disable_unsolicited_registration_events_system_info (ctx); common_enable_disable_unsolicited_registration_events_system_info (task);
return; return;
} }
#endif /* WITH_NEWEST_QMI_COMMANDS */ #endif /* WITH_NEWEST_QMI_COMMANDS */
@@ -5294,36 +5299,37 @@ modem_3gpp_disable_unsolicited_registration_events (MMIfaceModem3gpp *self,
/* Ability to explicitly enable/disable serving system indications was /* Ability to explicitly enable/disable serving system indications was
* added in NAS 1.2 */ * added in NAS 1.2 */
if (qmi_client_check_version (client, 1, 2)) { if (qmi_client_check_version (client, 1, 2)) {
common_enable_disable_unsolicited_registration_events_serving_system (ctx); common_enable_disable_unsolicited_registration_events_serving_system (task);
return; return;
} }
/* Devices with NAS < 1.2 will just always issue serving system indications */ /* Devices with NAS < 1.2 will just always issue serving system indications */
g_simple_async_result_set_error (ctx->result, self->priv->unsolicited_registration_events_enabled = FALSE;
g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Device doesn't allow disabling registration events"); "Device doesn't allow disabling registration events");
ctx->self->priv->unsolicited_registration_events_enabled = FALSE; g_object_unref (task);
unsolicited_registration_events_context_complete_and_free (ctx);
} }
static void static void
modem_3gpp_enable_unsolicited_registration_events (MMIfaceModem3gpp *self, modem_3gpp_enable_unsolicited_registration_events (MMIfaceModem3gpp *_self,
gboolean cs_supported, gboolean cs_supported,
gboolean ps_supported, gboolean ps_supported,
gboolean eps_supported, gboolean eps_supported,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
UnsolicitedRegistrationEventsContext *ctx; MMBroadbandModemQmi *self = MM_BROADBAND_MODEM_QMI (_self);
GTask *task;
QmiClient *client = NULL; QmiClient *client = NULL;
if (!ensure_qmi_client (MM_BROADBAND_MODEM_QMI (self), if (!assure_qmi_client (self,
QMI_SERVICE_NAS, &client, QMI_SERVICE_NAS, &client,
callback, user_data)) callback, user_data))
return; return;
ctx = unsolicited_registration_events_context_new (MM_BROADBAND_MODEM_QMI (self), task = unsolicited_registration_events_task_new (self,
client, client,
TRUE, TRUE,
callback, callback,
@@ -5332,15 +5338,15 @@ modem_3gpp_enable_unsolicited_registration_events (MMIfaceModem3gpp *self,
/* Ability to explicitly enable/disable serving system indications was /* Ability to explicitly enable/disable serving system indications was
* added in NAS 1.2 */ * added in NAS 1.2 */
if (qmi_client_check_version (client, 1, 2)) { if (qmi_client_check_version (client, 1, 2)) {
common_enable_disable_unsolicited_registration_events_serving_system (ctx); common_enable_disable_unsolicited_registration_events_serving_system (task);
return; return;
} }
/* Devices with NAS < 1.2 will just always issue serving system indications */ /* Devices with NAS < 1.2 will just always issue serving system indications */
mm_dbg ("Assuming serving system indications are always enabled"); mm_dbg ("Assuming serving system indications are always enabled");
g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); self->priv->unsolicited_registration_events_enabled = TRUE;
ctx->self->priv->unsolicited_registration_events_enabled = TRUE; g_task_return_boolean (task, TRUE);
unsolicited_registration_events_context_complete_and_free (ctx); g_object_unref (task);
} }
/*****************************************************************************/ /*****************************************************************************/