colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cinterion: radio/band single scfg line: no variance

Browse Source 
the AT^SCFG="Radio/Band" command does not return a different answer
for different charsets.
This code was working previously because the charset was left to default (GSM)
at the time of this operation, and therefore the string was unchanged anyway.
This commit is contained in:
Giacinto Cifelli
2020-07-24 16:25:03 +02:00
committed by Aleksander Morgado
parent 4d58278d7f
commit cec6fe9cce
2 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/cinterion/mm-modem-helpers-cinterion.c
View File

@@ -270,13 +270,8 @@ mm_cinterion_parse_scfg_test (const gchar *response,
*format = MM_CINTERION_RADIO_BAND_FORMAT_SINGLE; *format = MM_CINTERION_RADIO_BAND_FORMAT_SINGLE;
maxbandstr = mm_get_string_unquoted_from_match_info (match_info1, 2); maxbandstr = mm_get_string_unquoted_from_match_info (match_info1, 2);
if (maxbandstr) { if (maxbandstr)
/* Handle charset conversion if the number is given in UCS2 */
if (charset != MM_MODEM_CHARSET_UNKNOWN)
maxbandstr = mm_charset_take_and_convert_to_utf8 (maxbandstr, charset);
mm_get_uint_from_str (maxbandstr, &maxband); mm_get_uint_from_str (maxbandstr, &maxband);
}
if (maxband == 0) { if (maxband == 0) {
inner_error = g_error_new (MM_CORE_ERROR, inner_error = g_error_new (MM_CORE_ERROR,
@@ -419,12 +414,8 @@ mm_cinterion_parse_scfg_response (const gchar *response,
guint current = 0; guint current = 0;
currentstr = mm_get_string_unquoted_from_match_info (match_info, 1); currentstr = mm_get_string_unquoted_from_match_info (match_info, 1);
if (currentstr) { if (currentstr)
/* Handle charset conversion if the number is given in UCS2 */
if (charset != MM_MODEM_CHARSET_UNKNOWN)
currentstr = mm_charset_take_and_convert_to_utf8 (currentstr, charset);
mm_get_uint_from_str (currentstr, &current); mm_get_uint_from_str (currentstr, &current);
}
if (current == 0) { if (current == 0) {
inner_error = g_error_new (MM_CORE_ERROR, inner_error = g_error_new (MM_CORE_ERROR,

18
plugins/cinterion/tests/test-modem-helpers-cinterion.c
View File

@@ -509,23 +509,6 @@ test_scfg_response_2g (void)
g_array_unref (expected_bands); g_array_unref (expected_bands);
} }
static void
test_scfg_response_2g_ucs2 (void)
{
GArray *expected_bands;
MMModemBand single;
const gchar *response =
"^SCFG: \"Radio/Band\",\"0031\",\"0031\"\r\n"
"\r\n";
expected_bands = g_array_sized_new (FALSE, FALSE, sizeof (MMModemBand), 9);
single = MM_MODEM_BAND_EGSM, g_array_append_val (expected_bands, single);
common_test_scfg_response (response, MM_MODEM_CHARSET_UCS2, expected_bands, MM_CINTERION_MODEM_FAMILY_DEFAULT, MM_CINTERION_RADIO_BAND_FORMAT_SINGLE);
g_array_unref (expected_bands);
}
static void static void
test_scfg_response_3g (void) test_scfg_response_3g (void)
{ {
@@ -1629,7 +1612,6 @@ int main (int argc, char **argv)
g_test_add_func ("/MM/cinterion/scfg/alas5", test_scfg_alas5); g_test_add_func ("/MM/cinterion/scfg/alas5", test_scfg_alas5);
g_test_add_func ("/MM/cinterion/scfg/response/3g", test_scfg_response_3g); g_test_add_func ("/MM/cinterion/scfg/response/3g", test_scfg_response_3g);
g_test_add_func ("/MM/cinterion/scfg/response/2g", test_scfg_response_2g); g_test_add_func ("/MM/cinterion/scfg/response/2g", test_scfg_response_2g);
g_test_add_func ("/MM/cinterion/scfg/response/2g/ucs2", test_scfg_response_2g_ucs2);
g_test_add_func ("/MM/cinterion/scfg/response/pls62/gsm", test_scfg_response_pls62_gsm); g_test_add_func ("/MM/cinterion/scfg/response/pls62/gsm", test_scfg_response_pls62_gsm);
g_test_add_func ("/MM/cinterion/scfg/response/pls62/ucs2",test_scfg_response_pls62_ucs2); g_test_add_func ("/MM/cinterion/scfg/response/pls62/ucs2",test_scfg_response_pls62_ucs2);
g_test_add_func ("/MM/cinterion/scfg/response/alas5", test_scfg_response_alas5); g_test_add_func ("/MM/cinterion/scfg/response/alas5", test_scfg_response_alas5);