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

iface-modem-3gpp: port mm_iface_modem_3gpp_disable to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-06-29 04:46:20 -07:00
committed by Aleksander Morgado
parent da8b069f80
commit c973eb41b2
1 changed files with 53 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
src/mm-iface-modem-3gpp.c
View File

@@ -1386,7 +1386,7 @@ periodic_registration_check_enable (MMIfaceModem3gpp *self)
/*****************************************************************************/ /*****************************************************************************/
typedef struct _DisablingContext DisablingContext; typedef struct _DisablingContext DisablingContext;
static void interface_disabling_step (DisablingContext *ctx); static void interface_disabling_step (GTask *task);
typedef enum { typedef enum {
DISABLING_STEP_FIRST, DISABLING_STEP_FIRST,
@@ -1400,18 +1400,13 @@ typedef enum {
} DisablingStep; } DisablingStep;
struct _DisablingContext { struct _DisablingContext {
MMIfaceModem3gpp *self;
DisablingStep step; DisablingStep step;
GSimpleAsyncResult *result;
MmGdbusModem *skeleton; MmGdbusModem *skeleton;
}; };
static void static void
disabling_context_complete_and_free (DisablingContext *ctx) disabling_context_free (DisablingContext *ctx)
{ {
g_simple_async_result_complete_in_idle (ctx->result);
g_object_unref (ctx->self);
g_object_unref (ctx->result);
if (ctx->skeleton) if (ctx->skeleton)
g_object_unref (ctx->skeleton); g_object_unref (ctx->skeleton);
g_free (ctx); g_free (ctx);
@@ -1422,7 +1417,7 @@ mm_iface_modem_3gpp_disable_finish (MMIfaceModem3gpp *self,
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);
} }
#undef VOID_REPLY_READY_FN #undef VOID_REPLY_READY_FN
@@ -1430,8 +1425,9 @@ mm_iface_modem_3gpp_disable_finish (MMIfaceModem3gpp *self,
static void \ static void \
NAME##_ready (MMIfaceModem3gpp *self, \ NAME##_ready (MMIfaceModem3gpp *self, \
GAsyncResult *res, \ GAsyncResult *res, \
DisablingContext *ctx) \ GTask *task) \
{ \ { \
DisablingContext *ctx; \
GError *error = NULL; \ GError *error = NULL; \
\ \
MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->NAME##_finish (self, res, &error); \ MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->NAME##_finish (self, res, &error); \
@@ -1441,8 +1437,9 @@ mm_iface_modem_3gpp_disable_finish (MMIfaceModem3gpp *self,
} \ } \
\ \
/* Go on to next step */ \ /* Go on to next step */ \
ctx = g_task_get_task_data (task); \
ctx->step++; \ ctx->step++; \
interface_disabling_step (ctx); \ interface_disabling_step (task); \
} }
VOID_REPLY_READY_FN (cleanup_unsolicited_events, VOID_REPLY_READY_FN (cleanup_unsolicited_events,
@@ -1455,8 +1452,14 @@ VOID_REPLY_READY_FN (disable_unsolicited_registration_events,
"disable unsolicited registration events") "disable unsolicited registration events")
static void static void
interface_disabling_step (DisablingContext *ctx) interface_disabling_step (GTask *task)
{ {
MMIfaceModem3gpp *self;
DisablingContext *ctx;
self = g_task_get_source_object (task);
ctx = g_task_get_task_data (task);
switch (ctx->step) { switch (ctx->step) {
case DISABLING_STEP_FIRST: case DISABLING_STEP_FIRST:
/* Fall down to next step */ /* Fall down to next step */
@@ -1464,7 +1467,7 @@ interface_disabling_step (DisablingContext *ctx)
case DISABLING_STEP_PERIODIC_REGISTRATION_CHECKS: case DISABLING_STEP_PERIODIC_REGISTRATION_CHECKS:
/* Disable periodic registration checks, if they were set */ /* Disable periodic registration checks, if they were set */
periodic_registration_check_disable (ctx->self); periodic_registration_check_disable (self);
/* Fall down to next step */ /* Fall down to next step */
ctx->step++; ctx->step++;
@@ -1473,21 +1476,21 @@ interface_disabling_step (DisablingContext *ctx)
gboolean ps_supported = FALSE; gboolean ps_supported = FALSE;
gboolean eps_supported = FALSE; gboolean eps_supported = FALSE;
g_object_get (ctx->self, g_object_get (self,
MM_IFACE_MODEM_3GPP_CS_NETWORK_SUPPORTED, &cs_supported, MM_IFACE_MODEM_3GPP_CS_NETWORK_SUPPORTED, &cs_supported,
MM_IFACE_MODEM_3GPP_PS_NETWORK_SUPPORTED, &ps_supported, MM_IFACE_MODEM_3GPP_PS_NETWORK_SUPPORTED, &ps_supported,
MM_IFACE_MODEM_3GPP_EPS_NETWORK_SUPPORTED, &eps_supported, MM_IFACE_MODEM_3GPP_EPS_NETWORK_SUPPORTED, &eps_supported,
NULL); NULL);
if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->disable_unsolicited_registration_events && if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->disable_unsolicited_registration_events &&
MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->disable_unsolicited_registration_events_finish) { MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->disable_unsolicited_registration_events_finish) {
MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->disable_unsolicited_registration_events ( MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->disable_unsolicited_registration_events (
ctx->self, self,
cs_supported, cs_supported,
ps_supported, ps_supported,
eps_supported, eps_supported,
(GAsyncReadyCallback)disable_unsolicited_registration_events_ready, (GAsyncReadyCallback)disable_unsolicited_registration_events_ready,
ctx); task);
return; return;
} }
/* Fall down to next step */ /* Fall down to next step */
@@ -1495,52 +1498,52 @@ interface_disabling_step (DisablingContext *ctx)
} }
case DISABLING_STEP_CLEANUP_UNSOLICITED_REGISTRATION_EVENTS: case DISABLING_STEP_CLEANUP_UNSOLICITED_REGISTRATION_EVENTS:
if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->cleanup_unsolicited_registration_events && if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->cleanup_unsolicited_registration_events &&
MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->cleanup_unsolicited_registration_events_finish) { MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->cleanup_unsolicited_registration_events_finish) {
MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->cleanup_unsolicited_registration_events ( MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->cleanup_unsolicited_registration_events (
ctx->self, self,
(GAsyncReadyCallback)cleanup_unsolicited_registration_events_ready, (GAsyncReadyCallback)cleanup_unsolicited_registration_events_ready,
ctx); task);
return; return;
} }
/* Fall down to next step */ /* Fall down to next step */
ctx->step++; ctx->step++;
case DISABLING_STEP_CLEANUP_UNSOLICITED_EVENTS: case DISABLING_STEP_CLEANUP_UNSOLICITED_EVENTS:
if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->cleanup_unsolicited_events && if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->cleanup_unsolicited_events &&
MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->cleanup_unsolicited_events_finish) { MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->cleanup_unsolicited_events_finish) {
MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->cleanup_unsolicited_events ( MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->cleanup_unsolicited_events (
ctx->self, self,
(GAsyncReadyCallback)cleanup_unsolicited_events_ready, (GAsyncReadyCallback)cleanup_unsolicited_events_ready,
ctx); task);
return; return;
} }
/* Fall down to next step */ /* Fall down to next step */
ctx->step++; ctx->step++;
case DISABLING_STEP_DISABLE_UNSOLICITED_EVENTS: case DISABLING_STEP_DISABLE_UNSOLICITED_EVENTS:
if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->disable_unsolicited_events && if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->disable_unsolicited_events &&
MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->disable_unsolicited_events_finish) { MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->disable_unsolicited_events_finish) {
MM_IFACE_MODEM_3GPP_GET_INTERFACE (ctx->self)->disable_unsolicited_events ( MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->disable_unsolicited_events (
ctx->self, self,
(GAsyncReadyCallback)disable_unsolicited_events_ready, (GAsyncReadyCallback)disable_unsolicited_events_ready,
ctx); task);
return; return;
} }
/* Fall down to next step */ /* Fall down to next step */
ctx->step++; ctx->step++;
case DISABLING_STEP_REGISTRATION_STATE: case DISABLING_STEP_REGISTRATION_STATE:
update_registration_state (ctx->self, MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN, FALSE); update_registration_state (self, MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN, FALSE);
mm_iface_modem_3gpp_update_access_technologies (ctx->self, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN); mm_iface_modem_3gpp_update_access_technologies (self, MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN);
mm_iface_modem_3gpp_update_location (ctx->self, 0, 0); mm_iface_modem_3gpp_update_location (self, 0, 0);
/* Fall down to next step */ /* Fall down to next step */
ctx->step++; ctx->step++;
case DISABLING_STEP_LAST: case DISABLING_STEP_LAST:
/* We are done without errors! */ /* We are done without errors! */
g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); g_task_return_boolean (task, TRUE);
disabling_context_complete_and_free (ctx); g_object_unref (task);
return; return;
} }
@@ -1553,27 +1556,27 @@ mm_iface_modem_3gpp_disable (MMIfaceModem3gpp *self,
gpointer user_data) gpointer user_data)
{ {
DisablingContext *ctx; DisablingContext *ctx;
GTask *task;
ctx = g_new0 (DisablingContext, 1); ctx = g_new0 (DisablingContext, 1);
ctx->self = g_object_ref (self);
ctx->result = g_simple_async_result_new (G_OBJECT (self),
callback,
user_data,
mm_iface_modem_3gpp_disable);
ctx->step = DISABLING_STEP_FIRST; ctx->step = DISABLING_STEP_FIRST;
g_object_get (ctx->self,
task = g_task_new (self, NULL, callback, user_data);
g_task_set_task_data (task, ctx, (GDestroyNotify)disabling_context_free);
g_object_get (self,
MM_IFACE_MODEM_3GPP_DBUS_SKELETON, &ctx->skeleton, MM_IFACE_MODEM_3GPP_DBUS_SKELETON, &ctx->skeleton,
NULL); NULL);
if (!ctx->skeleton) { if (!ctx->skeleton) {
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,
"Couldn't get interface skeleton"); "Couldn't get interface skeleton");
disabling_context_complete_and_free (ctx); g_object_unref (task);
return; return;
} }
interface_disabling_step (ctx); interface_disabling_step (task);
} }
/*****************************************************************************/ /*****************************************************************************/