diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-modem-helpers-qmi.c | 32 | ||||
| -rw-r--r-- | src/mm-modem-helpers-qmi.h | 3 | ||||
| -rw-r--r-- | src/mm-shared-qmi.c | 2 | ||||
| -rw-r--r-- | src/tests/test-modem-helpers-qmi.c | 2 |
4 files changed, 19 insertions, 20 deletions
diff --git a/src/mm-modem-helpers-qmi.c b/src/mm-modem-helpers-qmi.c index 21ff7618..90a25996 100644 --- a/src/mm-modem-helpers-qmi.c +++ b/src/mm-modem-helpers-qmi.c @@ -1456,13 +1456,14 @@ mm_bearer_allowed_auth_to_qmi_authentication (MMBearerAllowedAuth auth) * as there would be no capability switching support. */ MMModemCapability -mm_modem_capability_from_qmi_capabilities_context (MMQmiCapabilitiesContext *ctx) +mm_modem_capability_from_qmi_capabilities_context (MMQmiCapabilitiesContext *ctx, + gpointer log_object) { MMModemCapability tmp = MM_MODEM_CAPABILITY_NONE; - gchar *nas_ssp_mode_preference_str; - gchar *nas_tp_str; - gchar *dms_capabilities_str; - gchar *tmp_str; + g_autofree gchar *nas_ssp_mode_preference_str = NULL; + g_autofree gchar *nas_tp_str = NULL; + g_autofree gchar *dms_capabilities_str = NULL; + g_autofree gchar *tmp_str = NULL; /* If not a multimode device, we're done */ #define MULTIMODE (MM_MODEM_CAPABILITY_GSM_UMTS | MM_MODEM_CAPABILITY_CDMA_EVDO) @@ -1494,18 +1495,15 @@ mm_modem_capability_from_qmi_capabilities_context (MMQmiCapabilitiesContext *ctx nas_tp_str = qmi_nas_radio_technology_preference_build_string_from_mask (ctx->nas_tp_mask); dms_capabilities_str = mm_modem_capability_build_string_from_mask (ctx->dms_capabilities); tmp_str = mm_modem_capability_build_string_from_mask (tmp); - mm_dbg ("Current capabilities built: '%s'\n" - " SSP mode preference: '%s'\n" - " TP: '%s'\n" - " DMS Capabilities: '%s'", - tmp_str, - nas_ssp_mode_preference_str ? nas_ssp_mode_preference_str : "unknown", - nas_tp_str ? nas_tp_str : "unknown", - dms_capabilities_str); - g_free (nas_ssp_mode_preference_str); - g_free (nas_tp_str); - g_free (dms_capabilities_str); - g_free (tmp_str); + mm_obj_dbg (log_object, + "Current capabilities built: '%s'\n" + " SSP mode preference: '%s'\n" + " TP: '%s'\n" + " DMS Capabilities: '%s'", + tmp_str, + nas_ssp_mode_preference_str ? nas_ssp_mode_preference_str : "unknown", + nas_tp_str ? nas_tp_str : "unknown", + dms_capabilities_str); return tmp; } diff --git a/src/mm-modem-helpers-qmi.h b/src/mm-modem-helpers-qmi.h index a66b76ef..42cb6711 100644 --- a/src/mm-modem-helpers-qmi.h +++ b/src/mm-modem-helpers-qmi.h @@ -143,7 +143,8 @@ typedef struct { MMModemCapability dms_capabilities; } MMQmiCapabilitiesContext; -MMModemCapability mm_modem_capability_from_qmi_capabilities_context (MMQmiCapabilitiesContext *ctx); +MMModemCapability mm_modem_capability_from_qmi_capabilities_context (MMQmiCapabilitiesContext *ctx, + gpointer log_object); /*****************************************************************************/ /* QMI unique id manipulation */ diff --git a/src/mm-shared-qmi.c b/src/mm-shared-qmi.c index 6d0f22e7..982bfd0b 100644 --- a/src/mm-shared-qmi.c +++ b/src/mm-shared-qmi.c @@ -897,7 +897,7 @@ load_current_capabilities_step (GTask *task) case LOAD_CURRENT_CAPABILITIES_STEP_LAST: g_assert (priv->feature_nas_technology_preference != FEATURE_UNKNOWN); g_assert (priv->feature_nas_system_selection_preference != FEATURE_UNKNOWN); - priv->current_capabilities = mm_modem_capability_from_qmi_capabilities_context (&ctx->capabilities_context); + priv->current_capabilities = mm_modem_capability_from_qmi_capabilities_context (&ctx->capabilities_context, self); g_task_return_int (task, priv->current_capabilities); g_object_unref (task); return; diff --git a/src/tests/test-modem-helpers-qmi.c b/src/tests/test-modem-helpers-qmi.c index e14a2282..e1f6af64 100644 --- a/src/tests/test-modem-helpers-qmi.c +++ b/src/tests/test-modem-helpers-qmi.c @@ -31,7 +31,7 @@ test_capabilities_expected (MMQmiCapabilitiesContext *ctx, gchar *expected_str; gchar *built_str; - built = mm_modem_capability_from_qmi_capabilities_context (ctx); + built = mm_modem_capability_from_qmi_capabilities_context (ctx, NULL); expected_str = mm_modem_capability_build_string_from_mask (expected); built_str = mm_modem_capability_build_string_from_mask (built); |