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

shared-qmi: filter out modes not currently available

Browse Source 
Do not build the mask of "all" modes based only on the supported radio
interfaces, also filter out those modes that would not be available
based on the current capabilities enabled.
This commit is contained in:
Aleksander Morgado
2022-01-31 22:42:48 +01:00
parent c7ff014e07
commit 9c08e54fb9
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mm-shared-qmi.c
View File

@@ -1703,6 +1703,14 @@ mm_shared_qmi_load_supported_modes (MMIfaceModem *self,
for (i = 0; i < priv->supported_radio_interfaces->len; i++)
ctx.all |= mm_modem_mode_from_qmi_radio_interface (g_array_index (priv->supported_radio_interfaces, QmiDmsRadioInterface, i), self);
/* Filter out those unsupported by the current capabilities */
if (!(priv->current_capabilities & (MM_MODEM_CAPABILITY_GSM_UMTS | MM_MODEM_CAPABILITY_CDMA_EVDO)))
ctx.all &= ~(MM_MODEM_MODE_2G | MM_MODEM_MODE_3G);
else if (!(priv->current_capabilities & MM_MODEM_CAPABILITY_LTE))
ctx.all &= ~MM_MODEM_MODE_4G;
else if (!(priv->current_capabilities & MM_MODEM_CAPABILITY_5GNR))
ctx.all &= ~MM_MODEM_MODE_5G;
ctx.nas_ssp_supported = (priv->feature_nas_ssp == FEATURE_SUPPORTED);
ctx.nas_tp_supported = (priv->feature_nas_tp == FEATURE_SUPPORTED);
ctx.current_capabilities = priv->current_capabilities;

2
src/tests/test-modem-helpers-qmi.c
View File

@@ -262,7 +262,7 @@ test_supported_modes_uml290_lte (void)
};
ctx.multimode = TRUE;
ctx.all = MM_MODEM_MODE_2G | MM_MODEM_MODE_3G | MM_MODEM_MODE_4G;
ctx.all = MM_MODEM_MODE_4G;
ctx.nas_ssp_supported = TRUE;
ctx.nas_tp_supported = FALSE;
ctx.current_capabilities = MM_MODEM_CAPABILITY_LTE;