aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2010-08-18 16:12:53 -0500
committerDan Williams <dcbw@redhat.com>2010-08-18 16:12:53 -0500
commit319424ccb39680a8d67869cadd5d54cf96ed1d86 (patch)
tree7fc389724c2c72cd2207383c80c5933154d8ac53 /src
parentd65c0269943a88821f0b57b03214efbe66923744 (diff)
gsm: recognize Motorola EZX errors
Nobody seems to know what the number means, but at least recognize them as errors.
Diffstat (limited to 'src')
-rw-r--r--src/mm-serial-parsers.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/mm-serial-parsers.c b/src/mm-serial-parsers.c
index 7c9598e8..00fe9dce 100644
--- a/src/mm-serial-parsers.c
+++ b/src/mm-serial-parsers.c
@@ -192,6 +192,7 @@ typedef struct {
GRegex *regex_connect;
GRegex *regex_cme_error;
GRegex *regex_cme_error_str;
+ GRegex *regex_ezx_error;
GRegex *regex_unknown_error;
GRegex *regex_connect_failed;
} MMSerialParserV1;
@@ -208,6 +209,7 @@ mm_serial_parser_v1_new (void)
parser->regex_connect = g_regex_new ("\\r\\nCONNECT.*\\r\\n", flags, 0, NULL);
parser->regex_cme_error = g_regex_new ("\\r\\n\\+CME ERROR: (\\d+)\\r\\n$", flags, 0, NULL);
parser->regex_cme_error_str = g_regex_new ("\\r\\n\\+CME ERROR: ([^\\n\\r]+)\\r\\n$", flags, 0, NULL);
+ parser->regex_ezx_error = g_regex_new ("\\r\\n\\MODEM ERROR: (\\d+)\\r\\n$", flags, 0, NULL);
parser->regex_unknown_error = g_regex_new ("\\r\\n(ERROR)|(COMMAND NOT SUPPORT)\\r\\n$", flags, 0, NULL);
parser->regex_connect_failed = g_regex_new ("\\r\\n(NO CARRIER)|(BUSY)|(NO ANSWER)|(NO DIALTONE)\\r\\n$", flags, 0, NULL);
@@ -273,6 +275,19 @@ mm_serial_parser_v1_parse (gpointer data,
goto done;
}
+ /* Motorola EZX errors */
+ found = g_regex_match_full (parser->regex_ezx_error,
+ response->str, response->len,
+ 0, 0, &match_info, NULL);
+ if (found) {
+ str = g_match_info_fetch (match_info, 1);
+ g_assert (str);
+ local_error = mm_mobile_error_for_code (MM_MOBILE_ERROR_UNKNOWN);
+ g_free (str);
+ g_match_info_free (match_info);
+ goto done;
+ }
+
/* Last resort; unknown error */
found = g_regex_match_full (parser->regex_unknown_error,
response->str, response->len,
@@ -332,6 +347,7 @@ mm_serial_parser_v1_destroy (gpointer data)
g_regex_unref (parser->regex_connect);
g_regex_unref (parser->regex_cme_error);
g_regex_unref (parser->regex_cme_error_str);
+ g_regex_unref (parser->regex_ezx_error);
g_regex_unref (parser->regex_unknown_error);
g_regex_unref (parser->regex_connect_failed);