diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2020-04-04 11:01:27 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2020-04-08 16:35:09 +0200 |
| commit | 5b1b33a894e3677dd633f032d5d9a07931096719 (patch) | |
| tree | b47eac5ae16027be833b91142c65f74e4bad1d73 /src | |
| parent | 3747f9e669204f0e609e36d629c708dafa1bb990 (diff) | |
modem-helpers: port cmer test parser to use object logging
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-broadband-modem.c | 2 | ||||
| -rw-r--r-- | src/mm-modem-helpers.c | 5 | ||||
| -rw-r--r-- | src/mm-modem-helpers.h | 1 | ||||
| -rw-r--r-- | src/tests/test-modem-helpers.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 1c244519..39faef42 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -3244,7 +3244,7 @@ cmer_format_check_ready (MMBroadbandModem *self, gchar *aux; result = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error); - if (error || !mm_3gpp_parse_cmer_test_response (result, &supported_modes, &supported_inds, &error)) { + if (error || !mm_3gpp_parse_cmer_test_response (result, self, &supported_modes, &supported_inds, &error)) { mm_obj_dbg (self, "+CMER check failed: %s", error->message); mm_obj_dbg (self, "generic indications are unsupported"); g_error_free (error); diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index d8415caa..51577a90 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -3331,6 +3331,7 @@ mm_3gpp_build_cmer_set_request (MM3gppCmerMode mode, gboolean mm_3gpp_parse_cmer_test_response (const gchar *response, + gpointer log_object, MM3gppCmerMode *out_supported_modes, MM3gppCmerInd *out_supported_inds, GError **error) @@ -3385,7 +3386,7 @@ mm_3gpp_parse_cmer_test_response (const gchar *response, if (mode_val <= 3) supported_modes |= (MM3gppCmerMode) (1 << mode_val); else - mm_dbg ("Unknown +CMER mode reported: %u", mode_val); + mm_obj_dbg (log_object, "unknown +CMER mode reported: %u", mode_val); } for (i = 0; i < array_supported_inds->len; i++) { @@ -3395,7 +3396,7 @@ mm_3gpp_parse_cmer_test_response (const gchar *response, if (ind_val <= 2) supported_inds |= (MM3gppCmerInd) (1 << ind_val); else - mm_dbg ("Unknown +CMER ind reported: %u", ind_val); + mm_obj_dbg (log_object, "unknown +CMER ind reported: %u", ind_val); } if (out_supported_modes) diff --git a/src/mm-modem-helpers.h b/src/mm-modem-helpers.h index 9a92a79b..61da24dd 100644 --- a/src/mm-modem-helpers.h +++ b/src/mm-modem-helpers.h @@ -285,6 +285,7 @@ typedef enum { /*< underscore_name=mm_3gpp_cmer_ind >*/ gchar *mm_3gpp_build_cmer_set_request (MM3gppCmerMode mode, MM3gppCmerInd ind); gboolean mm_3gpp_parse_cmer_test_response (const gchar *reply, + gpointer log_object, MM3gppCmerMode *supported_modes, MM3gppCmerInd *supported_inds, GError **error); diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c index f4947904..f1b236bd 100644 --- a/src/tests/test-modem-helpers.c +++ b/src/tests/test-modem-helpers.c @@ -1938,7 +1938,7 @@ test_cmer_response (const gchar *str, MM3gppCmerInd inds = MM_3GPP_CMER_IND_NONE; GError *error = NULL; - ret = mm_3gpp_parse_cmer_test_response (str, &modes, &inds, &error); + ret = mm_3gpp_parse_cmer_test_response (str, NULL, &modes, &inds, &error); g_assert_no_error (error); g_assert (ret); |