diff options
| -rw-r--r-- | src/mm-broadband-modem.c | 46 |
1 files changed, 31 insertions, 15 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index aa892ad0..36d73a65 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -1424,28 +1424,19 @@ signal_quality_cind_ready (MMBroadbandModem *self, GError *error = NULL; const gchar *result; GByteArray *indicators; + guint quality; result = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error); if (!error) indicators = mm_3gpp_parse_cind_read_response (result, &error); - if (error) + if (error) { g_simple_async_result_take_error (ctx->result, error); - else if (indicators->len >= self->priv->modem_cind_indicator_signal_quality) { - guint quality; - - quality = g_array_index (indicators, - guint8, - self->priv->modem_cind_indicator_signal_quality); - quality = normalize_ciev_cind_signal_quality (quality, - self->priv->modem_cind_min_signal_quality, - self->priv->modem_cind_max_signal_quality); - g_simple_async_result_set_op_res_gpointer (ctx->result, - GUINT_TO_POINTER (quality), - NULL); + signal_quality_context_complete_and_free (ctx); + return; + } - g_byte_array_free (indicators, TRUE); - } else + if (indicators->len < self->priv->modem_cind_indicator_signal_quality) { g_simple_async_result_set_error (ctx->result, MM_CORE_ERROR, MM_CORE_ERROR_FAILED, @@ -1453,7 +1444,32 @@ signal_quality_cind_ready (MMBroadbandModem *self, "signal index (%u) outside received range (0-%u)", self->priv->modem_cind_indicator_signal_quality, indicators->len); + g_byte_array_free (indicators, TRUE); + signal_quality_context_complete_and_free (ctx); + return; + } + + quality = g_array_index (indicators, + guint8, + self->priv->modem_cind_indicator_signal_quality); + g_byte_array_free (indicators, TRUE); + quality = normalize_ciev_cind_signal_quality (quality, + self->priv->modem_cind_min_signal_quality, + self->priv->modem_cind_max_signal_quality); + + /* Some LTE devices say they support signal via CIND, + * but always report zero even though they have signal. So + * if we get zero signal, try CSQ too. (bgo #636040) + */ + if (quality == 0) { + signal_quality_csq (ctx); + return; + } + + g_simple_async_result_set_op_res_gpointer (ctx->result, + GUINT_TO_POINTER (quality), + NULL); signal_quality_context_complete_and_free (ctx); } |