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

mbm: query supported modes to the modem with +CFUN=?

Browse Source 
We were trying to load the generic modes supported reported by either *CNTI=2 or
AT+WS46=?, so that then we could filter out the MBM-specific modes unsupported.

But, this may not be ideal, as both these two commands may fail:

    [mm-broadband-modem.c:1612] modem_load_supported_modes(): loading supported modes...
    [mm-port-serial.c:1237] mm_port_serial_open(): (ttyACM1) device open count is 3 (open)
    [mm-port-serial.c:1294] _close_internal(): (ttyACM1) device open count is 2 (close)
    [mm-port-serial-at.c:440] debug_log(): (ttyACM1): --> 'AT*CNTI=2<CR>'
    [mm-port-serial-at.c:440] debug_log(): (ttyACM1): <-- '<CR><LF>ERROR<CR><LF>'
    [mm-serial-parsers.c:364] mm_serial_parser_v1_parse(): Got failure code 100: Unknown error
    [mm-broadband-modem.c:1546] supported_modes_cnti_ready(): Generic query of supported 3GPP networks with *CNTI failed: 'Unknown error'
    [mm-port-serial.c:1237] mm_port_serial_open(): (ttyACM1) device open count is 3 (open)
    [mm-port-serial.c:1294] _close_internal(): (ttyACM1) device open count is 2 (close)
    [mm-port-serial-at.c:440] debug_log(): (ttyACM1): --> 'AT+WS46=?<CR>'
    [mm-port-serial-at.c:440] debug_log(): (ttyACM1): <-- '<CR><LF>ERROR<CR><LF>'
    [mm-serial-parsers.c:364] mm_serial_parser_v1_parse(): Got failure code 100: Unknown error
    [mm-broadband-modem.c:1494] supported_modes_ws46_test_ready(): Generic query of supported 3GPP networks with WS46=? failed: 'Unknown error'
    [mm-iface-modem.c:3974] load_supported_modes_ready(): couldn't load Supported Modes: 'Couldn't retrieve supported modes'

Instead, we'll ask the modem for the list of modes supported, and return that
directly.
This commit is contained in:
Aleksander Morgado
2016-01-10 17:46:12 +01:00
parent 138b3dabc2
commit 0ebf6d5da5
6 changed files with 281 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/mbm/tests/test-modem-helpers-mbm.c
+61 -1
View File
@@ -28,6 +28,8 @@
#include "mm-modem-helpers.h"
#include "mm-modem-helpers-mbm.h"
#define ENABLE_TEST_MESSAGE_TRACES
/*****************************************************************************/
/* Test *E2IPCFG responses */
@@ -47,7 +49,7 @@ typedef struct {
} E2ipcfgTest;
static const E2ipcfgTest tests[] = {
{ "*E2IPCFG: (1,\"46.157.32.246\")(2,\"46.157.32.243\")(3,\"193.213.112.4\")(3,\"130.67.15.198\")\r\n",
{ "*E2IPCFG: (1,\"46.157.32.246\")(2,\"46.157.32.243\")(3,\"193.213.112.4\")(3,\"130.67.15.198\")\r\n",
"46.157.32.246", "46.157.32.243", "193.213.112.4", "130.67.15.198",
NULL, NULL },
@@ -129,6 +131,63 @@ test_e2ipcfg (void)
}
}
/*****************************************************************************/
/* Test +CFUN test responses */
#define MAX_MODES 32
typedef struct {
const gchar *str;
guint32 expected_mask;
} CfunTest;
static const CfunTest cfun_tests[] = {
{
"+CFUN: (0,1,4-6),(1-0)\r\n",
((1 << MBM_NETWORK_MODE_OFFLINE) |
(1 << MBM_NETWORK_MODE_ANY) |
(1 << MBM_NETWORK_MODE_LOW_POWER) |
(1 << MBM_NETWORK_MODE_2G) |
(1 << MBM_NETWORK_MODE_3G))
},
{
"+CFUN: (0,1,4-6)\r\n",
((1 << MBM_NETWORK_MODE_OFFLINE) |
(1 << MBM_NETWORK_MODE_ANY) |
(1 << MBM_NETWORK_MODE_LOW_POWER) |
(1 << MBM_NETWORK_MODE_2G) |
(1 << MBM_NETWORK_MODE_3G))
},
{
"+CFUN: (0,1,4)\r\n",
((1 << MBM_NETWORK_MODE_OFFLINE) |
(1 << MBM_NETWORK_MODE_ANY) |
(1 << MBM_NETWORK_MODE_LOW_POWER))
},
{
"+CFUN: (0,1)\r\n",
((1 << MBM_NETWORK_MODE_OFFLINE) |
(1 << MBM_NETWORK_MODE_ANY))
},
};
static void
test_cfun (void)
{
guint i;
for (i = 0; i < G_N_ELEMENTS (cfun_tests); i++) {
guint32 mask;
gboolean success;
GError *error = NULL;
success = mm_mbm_parse_cfun_test (cfun_tests[i].str, &mask, &error);
g_assert_no_error (error);
g_assert (success);
g_assert_cmpuint (mask, ==, cfun_tests[i].expected_mask);
}
}
/*****************************************************************************/
void
@@ -159,6 +218,7 @@ int main (int argc, char **argv)
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/MM/mbm/e2ipcfg", test_e2ipcfg);
g_test_add_func ("/MM/mbm/cfun", test_cfun);
return g_test_run ();
}