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

huawei: handle some weird SYSCFG acquisition orders

Browse Source 
<debug> (ttyUSB2): --> 'AT^SYSCFG?<CR>'
<debug> (ttyUSB2): <-- '<CR><LF>^SYSCFG:14,2,400380,1,2<CR><LF><CR><LF>OK<CR><LF>'
<warn>  couldn't load current allowed/preferred modes: 'No SYSCFG combination found matching the current one (14,2)'

14,2 means "WCDMA-only; acquire WCDMA then GSM" which is somewhat
non-sensical. The supported modes parsing doesn't generate this
combination because it doesn't really make sense, so current mode
matching failed. Just fix up the non-sensical acquisition order
to 0 (automatic).
This commit is contained in:
Dan Williams
2016-10-04 15:43:55 -05:00
parent 9548192985
commit 14ccde2b5f
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/huawei/mm-modem-helpers-huawei.c
View File

@@ -904,6 +904,12 @@ mm_huawei_parse_syscfg_response (const gchar *response,
return NULL; return NULL;
} }
/* Fix invalid modes with non-sensical acquisition orders */
if (mode == 14 && acqorder != 0) /* WCDMA only but acqorder != "Automatic" */
acqorder = 0;
else if (mode == 13 && acqorder != 0) /* GSM only but acqorder != "Automatic" */
acqorder = 0;
/* Look for current modes among the supported ones */ /* Look for current modes among the supported ones */
for (i = 0; i < supported_mode_combinations->len; i++) { for (i = 0; i < supported_mode_combinations->len; i++) {
const MMHuaweiSyscfgCombination *combination; const MMHuaweiSyscfgCombination *combination;

14
plugins/huawei/tests/test-modem-helpers-huawei.c
View File

@@ -707,6 +707,20 @@ static const SyscfgResponseTest syscfg_response_tests[] = {
.format = "^SYSCFG:(2,13,14,16),(0-3),((400000,\"WCDMA2100\")),(0-2),(0-4)\r\n", .format = "^SYSCFG:(2,13,14,16),(0-3),((400000,\"WCDMA2100\")),(0-2),(0-4)\r\n",
.allowed = MM_MODEM_MODE_3G, .allowed = MM_MODEM_MODE_3G,
.preferred = MM_MODEM_MODE_NONE .preferred = MM_MODEM_MODE_NONE
},
{
/* Non-sensical acquisition order (WCDMA-only but acquire WCDMA-then-GSM */
.str = "^SYSCFG: 14,2,400000,0,3\r\n",
.format = "^SYSCFG:(2,13,14,16),(0-3),((400000,\"WCDMA2100\")),(0-2),(0-4)\r\n",
.allowed = MM_MODEM_MODE_3G,
.preferred = MM_MODEM_MODE_NONE
},
{
/* Non-sensical acquisition order (GSM-only but acquire GSM-then-WCDMA */
.str = "^SYSCFG: 13,1,400000,0,3\r\n",
.format = "^SYSCFG:(2,13,14,16),(0-3),((400000,\"WCDMA2100\")),(0-2),(0-4)\r\n",
.allowed = MM_MODEM_MODE_2G,
.preferred = MM_MODEM_MODE_NONE
} }
}; };