Merge remote-tracking branch 'lanedo/plugin-wavecom'

This commit is contained in:
Dan Williams
2011-04-14 14:20:43 -05:00
7 changed files with 1368 additions and 3 deletions
+2 -1
View File
@@ -74,8 +74,9 @@ typedef enum {
MM_MODEM_GSM_BAND_U900 = 0x00000400, /* WCDMA 3GPP UMTS 900 MHz (Class VIII) */
MM_MODEM_GSM_BAND_U17IX = 0x00000800, /* WCDMA 3GPP UMTS 1700 MHz (Class IX) */
MM_MODEM_GSM_BAND_U1900 = 0x00001000, /* WCDMA 3GPP UMTS 1900 MHz (Class II) */
MM_MODEM_GSM_BAND_U2600 = 0x00002000, /* WCDMA 3GPP UMTS 2600 MHz (Class VII, internal) */
MM_MODEM_GSM_BAND_LAST = MM_MODEM_GSM_BAND_U1900
MM_MODEM_GSM_BAND_LAST = MM_MODEM_GSM_BAND_U2600
} MMModemGsmBand;
+2 -1
View File
@@ -272,10 +272,11 @@ mm_serial_parser_v1_parse (gpointer data,
/* First, check for successful responses */
/* Custom successful replies first, if any */
if (parser->regex_custom_successful)
if (parser->regex_custom_successful) {
found = g_regex_match_full (parser->regex_custom_successful,
response->str, response->len,
0, 0, NULL, NULL);
}
if (!found) {
found = g_regex_match_full (parser->regex_ok,