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

modem-helpers-qmi: port qmi capabilities parser to use object logging

Browse Source
This commit is contained in:
Aleksander Morgado
2020-04-04 14:25:46 +02:00
parent 07b492c887
commit bca5c5e423
4 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/mm-modem-helpers-qmi.c
View File

@@ -1456,13 +1456,14 @@ mm_bearer_allowed_auth_to_qmi_authentication (MMBearerAllowedAuth auth)
* as there would be no capability switching support. * as there would be no capability switching support.
*/ */
MMModemCapability 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; MMModemCapability tmp = MM_MODEM_CAPABILITY_NONE;
gchar *nas_ssp_mode_preference_str; g_autofree gchar *nas_ssp_mode_preference_str = NULL;
gchar *nas_tp_str; g_autofree gchar *nas_tp_str = NULL;
gchar *dms_capabilities_str; g_autofree gchar *dms_capabilities_str = NULL;
gchar *tmp_str; g_autofree gchar *tmp_str = NULL;
/* If not a multimode device, we're done */ /* If not a multimode device, we're done */
#define MULTIMODE (MM_MODEM_CAPABILITY_GSM_UMTS | MM_MODEM_CAPABILITY_CDMA_EVDO) #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); 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); dms_capabilities_str = mm_modem_capability_build_string_from_mask (ctx->dms_capabilities);
tmp_str = mm_modem_capability_build_string_from_mask (tmp); tmp_str = mm_modem_capability_build_string_from_mask (tmp);
mm_dbg ("Current capabilities built: '%s'\n" mm_obj_dbg (log_object,
" SSP mode preference: '%s'\n" "Current capabilities built: '%s'\n"
" TP: '%s'\n" " SSP mode preference: '%s'\n"
" DMS Capabilities: '%s'", " TP: '%s'\n"
tmp_str, " DMS Capabilities: '%s'",
nas_ssp_mode_preference_str ? nas_ssp_mode_preference_str : "unknown", tmp_str,
nas_tp_str ? nas_tp_str : "unknown", nas_ssp_mode_preference_str ? nas_ssp_mode_preference_str : "unknown",
dms_capabilities_str); nas_tp_str ? nas_tp_str : "unknown",
g_free (nas_ssp_mode_preference_str); dms_capabilities_str);
g_free (nas_tp_str);
g_free (dms_capabilities_str);
g_free (tmp_str);
return tmp; return tmp;
} }

3
src/mm-modem-helpers-qmi.h
View File

@@ -143,7 +143,8 @@ typedef struct {
MMModemCapability dms_capabilities; MMModemCapability dms_capabilities;
} MMQmiCapabilitiesContext; } 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 */ /* QMI unique id manipulation */

2
src/mm-shared-qmi.c
View File

@@ -897,7 +897,7 @@ load_current_capabilities_step (GTask *task)
case LOAD_CURRENT_CAPABILITIES_STEP_LAST: case LOAD_CURRENT_CAPABILITIES_STEP_LAST:
g_assert (priv->feature_nas_technology_preference != FEATURE_UNKNOWN); g_assert (priv->feature_nas_technology_preference != FEATURE_UNKNOWN);
g_assert (priv->feature_nas_system_selection_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_task_return_int (task, priv->current_capabilities);
g_object_unref (task); g_object_unref (task);
return; return;

2
src/tests/test-modem-helpers-qmi.c
View File

@@ -31,7 +31,7 @@ test_capabilities_expected (MMQmiCapabilitiesContext *ctx,
gchar *expected_str; gchar *expected_str;
gchar *built_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); expected_str = mm_modem_capability_build_string_from_mask (expected);
built_str = mm_modem_capability_build_string_from_mask (built); built_str = mm_modem_capability_build_string_from_mask (built);