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

broadband-modem: fall back to +CSQ if +CIND signal quality checking fails

Browse Source 
If +CIND fails for any reason (generic failure, wrong indexes, etc) or
reports zero signal strength (quirky modem) then fall back to +CSQ.
This commit is contained in:
Dan Williams
2012-11-26 13:55:07 -06:00
parent 562055b53b
commit 33f440c885
1 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1426,53 +1426,55 @@ signal_quality_cind_ready (MMBroadbandModem *self,
GError *error = NULL; GError *error = NULL;
const gchar *result; const gchar *result;
GByteArray *indicators; GByteArray *indicators;
guint quality; guint quality = 0;
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 (!error)
indicators = mm_3gpp_parse_cind_read_response (result, &error);
if (error) { if (error) {
g_simple_async_result_take_error (ctx->result, error); g_clear_error (&error);
signal_quality_context_complete_and_free (ctx); goto try_csq;
return; }
indicators = mm_3gpp_parse_cind_read_response (result, &error);
if (!indicators) {
mm_dbg ("(%s) Could not parse CIND signal quality results: %s",
mm_port_get_device (MM_PORT (ctx->port)),
error->message);
g_clear_error (&error);
goto try_csq;
} }
if (indicators->len < self->priv->modem_cind_indicator_signal_quality) { if (indicators->len < self->priv->modem_cind_indicator_signal_quality) {
g_simple_async_result_set_error (ctx->result, mm_dbg ("(%s) Could not parse CIND signal quality results; signal "
MM_CORE_ERROR, "index (%u) outside received range (0-%u)",
MM_CORE_ERROR_FAILED, mm_port_get_device (MM_PORT (ctx->port)),
"Could not parse CIND signal quality results " self->priv->modem_cind_indicator_signal_quality,
"signal index (%u) outside received range (0-%u)", indicators->len);
self->priv->modem_cind_indicator_signal_quality, } else {
indicators->len); quality = g_array_index (indicators,
g_byte_array_free (indicators, TRUE); 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_byte_array_free (indicators, TRUE);
if (quality > 0) {
/* +CIND success */
g_simple_async_result_set_op_res_gpointer (ctx->result,
GUINT_TO_POINTER (quality),
NULL);
signal_quality_context_complete_and_free (ctx); signal_quality_context_complete_and_free (ctx);
return; return;
} }
quality = g_array_index (indicators, try_csq:
guint8, /* Always fall back to +CSQ if for whatever reason +CIND failed. Also,
self->priv->modem_cind_indicator_signal_quality); * some QMI-based devices say they support signal via CIND, but always
g_byte_array_free (indicators, TRUE); * report zero even though they have signal. So if we get zero signal
* from +CIND, try CSQ too. (bgo #636040)
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);
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);
} }
static void static void