diff options
| -rw-r--r-- | src/mm-modem-helpers.c | 2 | ||||
| -rw-r--r-- | src/tests/test-modem-helpers.c | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index f13b4f27..f6a0ffa3 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -235,7 +235,7 @@ mm_gsm_destroy_scan_data (gpointer data) #define CREG3 "\\+(CREG|CGREG):\\s*(\\d{1}),\\s*([^,\\s]*)\\s*,\\s*([^,\\s]*)" /* +CREG: <n>,<stat>,<lac>,<ci> (GSM 07.07 solicited and some CREG=2 unsolicited) */ -#define CREG4 "\\+(CREG|CGREG):\\s*(\\d{1}),\\s*(\\d{1})\\s*,\\s*([^,\\s]*)\\s*,\\s*([^,\\s]*)" +#define CREG4 "\\+(CREG|CGREG):\\s*(\\d{1}),\\s*(\\d{1})\\s*,\\s*([^,]*)\\s*,\\s*([^,\\s]*)" /* +CREG: <stat>,<lac>,<ci>,<AcT> (ETSI 27.007 CREG=2 unsolicited) */ #define CREG5 "\\+(CREG|CGREG):\\s*(\\d{1})\\s*,\\s*([^,\\s]*)\\s*,\\s*([^,\\s]*)\\s*,\\s*(\\d{1,2})" diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c index 946916ff..d07f0d4a 100644 --- a/src/tests/test-modem-helpers.c +++ b/src/tests/test-modem-helpers.c @@ -733,6 +733,16 @@ test_creg2_s8500_wave_unsolicited (void *f, gpointer d) } static void +test_creg2_gobi_weird_solicited (void *f, gpointer d) +{ + TestData *data = (TestData *) d; + const char *reply = "\r\n+CREG: 2,1, 0 5, 2715\r\n"; + const CregResult result = { 1, 0x0000, 0x2715, -1, 4, FALSE}; + + test_creg_match ("Qualcomm Gobi 1000 CREG=2", TRUE, reply, data, &result); +} + +static void test_cscs_icon225_support_response (void *f, gpointer d) { const char *reply = "\r\n+CSCS: (\"IRA\",\"GSM\",\"UCS2\")\r\n"; @@ -1251,6 +1261,7 @@ int main (int argc, char **argv) g_test_suite_add (suite, TESTCASE (test_creg2_xu870_unsolicited_unregistered, data)); g_test_suite_add (suite, TESTCASE (test_creg2_md400_unsolicited, data)); g_test_suite_add (suite, TESTCASE (test_creg2_s8500_wave_unsolicited, data)); + g_test_suite_add (suite, TESTCASE (test_creg2_gobi_weird_solicited, data)); g_test_suite_add (suite, TESTCASE (test_cgreg1_solicited, data)); g_test_suite_add (suite, TESTCASE (test_cgreg1_unsolicited, data)); |