diff options
| author | Michał Sroczyński <msroczyn@gmail.com> | 2011-01-11 13:41:53 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2011-01-11 13:42:54 -0600 |
| commit | f4d4569cdd4441ea210297cf1ed14b8e7e77fd34 (patch) | |
| tree | bdc7d53ff7635e5c385b9bafbb987aec68bc8448 | |
| parent | 7a2031613aa2405c9414ff1f3a4d3d18362d4a52 (diff) | |
gsm: correctly parse Samsung S8500 Wave CREG response
(testcases by dcbw)
| -rw-r--r-- | src/mm-modem-helpers.c | 14 | ||||
| -rw-r--r-- | src/tests/test-modem-helpers.c | 11 |
2 files changed, 24 insertions, 1 deletions
diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index d470f4f6..499c0dde 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -242,10 +242,14 @@ mm_gsm_destroy_scan_data (gpointer data) /* +CREG: <n>,<stat>,<lac>,<ci>,<AcT> (ETSI 27.007 solicited and some CREG=2 unsolicited) */ #define CREG6 "\\+(CREG|CGREG):\\s*(\\d{1}),\\s*(\\d{1})\\s*,\\s*([^,\\s]*)\\s*,\\s*([^,\\s]*)\\s*,\\s*(\\d{1,2})" +/* +CREG: <n>,<stat>,<lac>,<ci>,<AcT?>,<something> (Samsung Wave S8500) */ +/* '<CR><LF>+CREG: 2,1,000B,2816, B, C2816<CR><LF><CR><LF>OK<CR><LF>' */ +#define CREG7 "\\+(CREG|CGREG):\\s*(\\d{1}),\\s*(\\d{1})\\s*,\\s*([^,\\s]*)\\s*,\\s*([^,\\s]*)\\s*,\\s*([^,\\s]*)\\s*,\\s*[^,\\s]*" + GPtrArray * mm_gsm_creg_regex_get (gboolean solicited) { - GPtrArray *array = g_ptr_array_sized_new (6); + GPtrArray *array = g_ptr_array_sized_new (7); GRegex *regex; /* #1 */ @@ -296,6 +300,14 @@ mm_gsm_creg_regex_get (gboolean solicited) g_assert (regex); g_ptr_array_add (array, regex); + /* #7 */ + if (solicited) + regex = g_regex_new (CREG7 "$", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); + else + regex = g_regex_new ("\\r\\n" CREG7 "\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL); + g_assert (regex); + g_ptr_array_add (array, regex); + return array; } diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c index cd1e1bb4..038f1f14 100644 --- a/src/tests/test-modem-helpers.c +++ b/src/tests/test-modem-helpers.c @@ -722,6 +722,16 @@ test_cgreg2_x220_unsolicited (void *f, gpointer d) } static void +test_creg2_s8500_wave_unsolicited (void *f, gpointer d) +{ + TestData *data = (TestData *) d; + const char *reply = "\r\n+CREG: 2,1,000B,2816, B, C2816\r\n"; + const CregResult result = { 1, 0x000B, 0x2816, 0, 7, FALSE}; + + test_creg_match ("Samsung Wave S8500 CREG=2", FALSE, 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"; @@ -1231,6 +1241,7 @@ int main (int argc, char **argv) g_test_suite_add (suite, TESTCASE (test_creg2_tm506_solicited, data)); 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_cgreg1_solicited, data)); g_test_suite_add (suite, TESTCASE (test_cgreg1_unsolicited, data)); |