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

plugins,telit: refactor to reduce scope of variable

Browse Source 
In mm_telit_build_bnd_request the scope of some 3g related variables can
be reduced.
This commit is contained in:
Carlo Lobrano
2022-08-11 10:34:17 +02:00
parent a55384d7b0
commit 3ab3d5e899
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/telit/mm-modem-helpers-telit.c
View File

@@ -208,23 +208,10 @@ mm_telit_build_bnd_request (GArray *bands_array,
gint64 flag3g = -1; gint64 flag3g = -1;
gint64 flag4g = -1; gint64 flag4g = -1;
gchar *cmd; gchar *cmd;
const guint64 *telit_3g_to_mm_band_mask;
guint telit_3g_to_mm_band_mask_n_elements;
gboolean modem_is_2g = config->modem_is_2g; gboolean modem_is_2g = config->modem_is_2g;
gboolean modem_is_3g = config->modem_is_3g; gboolean modem_is_3g = config->modem_is_3g;
gboolean modem_is_4g = config->modem_is_4g; gboolean modem_is_4g = config->modem_is_4g;
initialize_telit_3g_to_mm_band_masks ();
/* Select correct 3G band mask */
if (config->modem_alternate_3g_bands) {
telit_3g_to_mm_band_mask = telit_3g_to_mm_band_mask_alternate;
telit_3g_to_mm_band_mask_n_elements = G_N_ELEMENTS (telit_3g_to_mm_band_mask_alternate);
} else {
telit_3g_to_mm_band_mask = telit_3g_to_mm_band_mask_default;
telit_3g_to_mm_band_mask_n_elements = G_N_ELEMENTS (telit_3g_to_mm_band_mask_default);
}
for (i = 0; i < bands_array->len; i++) { for (i = 0; i < bands_array->len; i++) {
MMModemBand band; MMModemBand band;
@@ -272,6 +259,19 @@ mm_telit_build_bnd_request (GArray *bands_array,
/* Get 3G-specific telit value */ /* Get 3G-specific telit value */
if (mask3g) { if (mask3g) {
const guint64 *telit_3g_to_mm_band_mask;
guint telit_3g_to_mm_band_mask_n_elements;
initialize_telit_3g_to_mm_band_masks ();
/* Select correct 3G band mask */
if (config->modem_alternate_3g_bands) {
telit_3g_to_mm_band_mask = telit_3g_to_mm_band_mask_alternate;
telit_3g_to_mm_band_mask_n_elements = G_N_ELEMENTS (telit_3g_to_mm_band_mask_alternate);
} else {
telit_3g_to_mm_band_mask = telit_3g_to_mm_band_mask_default;
telit_3g_to_mm_band_mask_n_elements = G_N_ELEMENTS (telit_3g_to_mm_band_mask_default);
}
for (i = 0; i < telit_3g_to_mm_band_mask_n_elements; i++) { for (i = 0; i < telit_3g_to_mm_band_mask_n_elements; i++) {
if (mask3g == telit_3g_to_mm_band_mask[i]) { if (mask3g == telit_3g_to_mm_band_mask[i]) {
flag3g = i; flag3g = i;