diff options
| author | Dan Williams <dcbw@redhat.com> | 2011-04-14 14:20:43 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2011-04-14 14:20:43 -0500 |
| commit | 5dadfa4c214be79e704eb61c135893f93a705d3a (patch) | |
| tree | 875c24a1f3f679af9fb53c10d30b25dc5780c667 /src | |
| parent | 487972c1ac40b057c35dac51958f04c13f6137d8 (diff) | |
| parent | 765da63ad2ddb47d90ad8ffa5b2d0569301b2ba3 (diff) | |
Merge remote-tracking branch 'lanedo/plugin-wavecom'
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-modem-gsm.h | 3 | ||||
| -rw-r--r-- | src/mm-serial-parsers.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mm-modem-gsm.h b/src/mm-modem-gsm.h index a427d354..83dfb319 100644 --- a/src/mm-modem-gsm.h +++ b/src/mm-modem-gsm.h @@ -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; diff --git a/src/mm-serial-parsers.c b/src/mm-serial-parsers.c index 1528a59b..f83301d2 100644 --- a/src/mm-serial-parsers.c +++ b/src/mm-serial-parsers.c @@ -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, |