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

plugins,telit: Detect ext_4g_bands flag from modem model

Browse Source 
Currently, mm-shared-telit:Private:ext_4g_bands value is inferred from
the #BND? response, based on the convention that the #BND? response has
4 tokens only if the modem has LTE extended bands.

This commit maps the value of ext_4g_bands to the modem model, detected
via software version string, which is a more reliable source.
This commit is contained in:
Carlo Lobrano
2022-09-29 07:03:37 +00:00
parent b0c5756b0f
commit 72ca66765f
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/telit/mm-modem-helpers-telit.c
-10
View File
@@ -667,15 +667,6 @@ typedef enum {
LOAD_BANDS_TYPE_CURRENT,
} LoadBandsType;
static gboolean
bnd_response_has_ext_4g_bands (const gchar *response)
{
g_auto(GStrv) tokens = NULL;
tokens = mm_split_string_groups (response);
return g_strv_length (tokens) == 4;
}
/* Regex tokens for #BND parsing */
#define MM_SUPPORTED_BANDS_2G "\\s*\\((?P<Bands2G>[0-9\\-,]*)\\)"
#define MM_SUPPORTED_BANDS_3G "(,\\s*\\((?P<Bands3G>[0-9\\-,]*)\\))?"
@@ -783,7 +774,6 @@ mm_telit_parse_bnd_test_response (const gchar *response,
gpointer log_object,
GError **error)
{
config->modem_ext_4g_bands = bnd_response_has_ext_4g_bands (response);
return common_parse_bnd_response (response,
config,
LOAD_BANDS_TYPE_SUPPORTED,
plugins/telit/mm-shared-telit.c
+12 -3
View File
@@ -71,6 +71,17 @@ is_bnd_4g_format_hex (const gchar *revision)
model == MM_TELIT_MODEL_LN920);
}
static gboolean
has_extended_4g_bands (const gchar *revision)
{
MMTelitModel model;
model = mm_telit_model_from_revision (revision);
return (model == MM_TELIT_MODEL_FN980 ||
model == MM_TELIT_MODEL_FN990 ||
model == MM_TELIT_MODEL_LN920);
}
static void
initialize_alternate_3g_band (MMSharedTelit *self,
Private *priv)
@@ -101,7 +112,6 @@ get_private (MMSharedTelit *self)
if (!priv) {
priv = g_slice_new0 (Private);
initialize_alternate_3g_band (self, priv);
/* ext_4g_bands field is initialized inside #BND=? response handler */
if (MM_SHARED_TELIT_GET_INTERFACE (self)->peek_parent_modem_interface)
priv->iface_modem_parent = MM_SHARED_TELIT_GET_INTERFACE (self)->peek_parent_modem_interface (self);
@@ -131,6 +141,7 @@ mm_shared_telit_store_revision (MMSharedTelit *self,
priv = get_private (MM_SHARED_TELIT (self));
g_clear_pointer (&priv->software_package_version, g_free);
priv->software_package_version = g_strdup (revision);
priv->ext_4g_bands = has_extended_4g_bands (revision);
}
void
@@ -260,8 +271,6 @@ load_supported_bands_ready (MMBaseModem *self,
mm_shared_telit_get_bnd_parse_config (MM_IFACE_MODEM (self), &config);
bands = mm_telit_parse_bnd_test_response (response, &config, self, &error);
/* update ext_4g_bands regardless the bands value */
priv->ext_4g_bands = config.modem_ext_4g_bands;
if (!bands)
g_task_return_error (task, error);
else {