[PATCH] huawei: handle some weird SYSCFG acquisition orders

[Aleksander Morgado]

On Tue, Oct 4, 2016 at 10:48 PM, Dan Williams <dcbw at redhat.com> wrote:
> <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).

LGTM

> ---
>  plugins/huawei/mm-modem-helpers-huawei.c         |  6 ++++++
>  plugins/huawei/tests/test-modem-helpers-huawei.c | 14 ++++++++++++++
>  2 files changed, 20 insertions(+)
>
> diff --git a/plugins/huawei/mm-modem-helpers-huawei.c b/plugins/huawei/mm-modem-helpers-huawei.c
> index d3f13c2..fde1c79 100644
> --- a/plugins/huawei/mm-modem-helpers-huawei.c
> +++ b/plugins/huawei/mm-modem-helpers-huawei.c
> @@ -904,6 +904,12 @@ mm_huawei_parse_syscfg_response (const gchar *response,
>          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 */
>      for (i = 0; i < supported_mode_combinations->len; i++) {
>          const MMHuaweiSyscfgCombination *combination;
> diff --git a/plugins/huawei/tests/test-modem-helpers-huawei.c b/plugins/huawei/tests/test-modem-helpers-huawei.c
> index 13601c4..7044582 100644
> --- a/plugins/huawei/tests/test-modem-helpers-huawei.c
> +++ b/plugins/huawei/tests/test-modem-helpers-huawei.c
> @@ -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",
>          .allowed = MM_MODEM_MODE_3G,
>          .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
>      }
>  };
>
> --
> 2.7.4
> _______________________________________________
> ModemManager-devel mailing list
> ModemManager-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/modemmanager-devel



-- 
Aleksander
https://aleksander.es