diff options
| -rw-r--r-- | src/mm-iface-modem-3gpp.c | 2 | ||||
| -rw-r--r-- | src/mm-iface-modem.c | 29 | ||||
| -rw-r--r-- | src/mm-iface-modem.h | 2 |
3 files changed, 9 insertions, 24 deletions
diff --git a/src/mm-iface-modem-3gpp.c b/src/mm-iface-modem-3gpp.c index 6c75c4a5..3629a825 100644 --- a/src/mm-iface-modem-3gpp.c +++ b/src/mm-iface-modem-3gpp.c @@ -320,7 +320,7 @@ run_registration_checks_ready (MMIfaceModem3gpp *self, * from home to roaming or viceversa, both registered states, so there * wouldn't be an explicit refresh triggered from the modem interface as * the modem never got un-registered during the sequence. */ - mm_iface_modem_refresh_signal (MM_IFACE_MODEM (ctx->self), FALSE); + mm_iface_modem_refresh_signal (MM_IFACE_MODEM (ctx->self)); mm_obj_dbg (self, "currently registered in a 3GPP network"); g_task_return_boolean (task, TRUE); g_object_unref (task); diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c index e0c84b5b..3c489505 100644 --- a/src/mm-iface-modem.c +++ b/src/mm-iface-modem.c @@ -1594,27 +1594,12 @@ periodic_signal_check_cb (MMIfaceModem *self) } void -mm_iface_modem_refresh_signal (MMIfaceModem *self, - gboolean enforce) +mm_iface_modem_refresh_signal (MMIfaceModem *self) { SignalCheckContext *ctx; ctx = get_signal_check_context (self); - /* - * If enforced, poll once explicitly to make sure the signal strength - * and access technologies are updated. - * - * Modems with signal indication support block periodic polling scheduling. - * With enforce == TRUE, the periodic polling logic can run once as - * it override once the periodic polling prohibition. - * When the polling is complete, the periodic polling scheduling - * is blocked again to avoid that modems with signal indication support - * are periodic polled for their signal status. - */ - if (enforce) - ctx->enabled = TRUE; - /* Don't refresh polling if we're not enabled */ if (!ctx->enabled) { mm_obj_dbg (self, "periodic signal check refresh ignored: checks not enabled"); @@ -1694,7 +1679,7 @@ periodic_signal_check_enable (MMIfaceModem *self) } /* And refresh, which will trigger the first check at high frequency */ - mm_iface_modem_refresh_signal (self, FALSE); + mm_iface_modem_refresh_signal (self); } /*****************************************************************************/ @@ -2368,7 +2353,7 @@ set_current_capabilities_ready (MMIfaceModem *self, g_dbus_method_invocation_take_error (ctx->invocation, error); else { /* Capabilities updated: explicitly refresh signal and access technology */ - mm_iface_modem_refresh_signal (self, FALSE); + mm_iface_modem_refresh_signal (self); mm_gdbus_modem_complete_set_current_capabilities (ctx->skeleton, ctx->invocation); } @@ -2858,7 +2843,7 @@ handle_set_current_bands_ready (MMIfaceModem *self, g_dbus_method_invocation_take_error (ctx->invocation, error); else { /* Bands updated: explicitly refresh signal and access technology */ - mm_iface_modem_refresh_signal (self, FALSE); + mm_iface_modem_refresh_signal (self); mm_gdbus_modem_complete_set_current_bands (ctx->skeleton, ctx->invocation); } @@ -3245,7 +3230,7 @@ handle_set_current_modes_ready (MMIfaceModem *self, g_dbus_method_invocation_take_error (ctx->invocation, error); else { /* Modes updated: explicitly refresh signal and access technology */ - mm_iface_modem_refresh_signal (self, FALSE); + mm_iface_modem_refresh_signal (self); mm_gdbus_modem_complete_set_current_modes (ctx->skeleton, ctx->invocation); } @@ -4331,9 +4316,9 @@ interface_syncing_step (GTask *task) case SYNCING_STEP_REFRESH_SIGNAL_STRENGTH: /* - * Start a signal strength and access technologies refresh sequence. + * Restart the signal strength and access technologies refresh sequence. */ - mm_iface_modem_refresh_signal (self, TRUE); + mm_iface_modem_refresh_signal (self); ctx->step++; /* fall through */ diff --git a/src/mm-iface-modem.h b/src/mm-iface-modem.h index 563c5fe1..fa2b3dc8 100644 --- a/src/mm-iface-modem.h +++ b/src/mm-iface-modem.h @@ -557,7 +557,7 @@ void mm_iface_modem_update_signal_quality (MMIfaceModem *self, guint signal_quality); /* Allow requesting to refresh signal via polling */ -void mm_iface_modem_refresh_signal (MMIfaceModem *self, gboolean enforce); +void mm_iface_modem_refresh_signal (MMIfaceModem *self); /* Allow setting allowed modes */ void mm_iface_modem_set_current_modes (MMIfaceModem *self, |