diff options
| -rw-r--r-- | src/mm-modem-helpers-qmi.c | 15 | ||||
| -rw-r--r-- | src/mm-modem-helpers-qmi.h | 6 | ||||
| -rw-r--r-- | src/mm-shared-qmi.c | 7 |
3 files changed, 17 insertions, 11 deletions
diff --git a/src/mm-modem-helpers-qmi.c b/src/mm-modem-helpers-qmi.c index 05d5fa0a..21ff7618 100644 --- a/src/mm-modem-helpers-qmi.c +++ b/src/mm-modem-helpers-qmi.c @@ -1257,7 +1257,8 @@ mm_modem_capability_from_qmi_band_preference (QmiNasBandPreference qmi) /*****************************************************************************/ MMModemMode -mm_modem_mode_from_qmi_gsm_wcdma_acquisition_order_preference (QmiNasGsmWcdmaAcquisitionOrderPreference qmi) +mm_modem_mode_from_qmi_gsm_wcdma_acquisition_order_preference (QmiNasGsmWcdmaAcquisitionOrderPreference qmi, + gpointer log_object) { switch (qmi) { case QMI_NAS_GSM_WCDMA_ACQUISITION_ORDER_PREFERENCE_AUTOMATIC: @@ -1267,16 +1268,17 @@ mm_modem_mode_from_qmi_gsm_wcdma_acquisition_order_preference (QmiNasGsmWcdmaAcq case QMI_NAS_GSM_WCDMA_ACQUISITION_ORDER_PREFERENCE_WCDMA: return MM_MODEM_MODE_3G; default: - mm_dbg ("Unknown acquisition order preference: '%s'", - qmi_nas_gsm_wcdma_acquisition_order_preference_get_string (qmi)); + mm_obj_dbg (log_object, "unknown acquisition order preference: '%s'", + qmi_nas_gsm_wcdma_acquisition_order_preference_get_string (qmi)); return MM_MODEM_MODE_NONE; } } QmiNasGsmWcdmaAcquisitionOrderPreference -mm_modem_mode_to_qmi_gsm_wcdma_acquisition_order_preference (MMModemMode mode) +mm_modem_mode_to_qmi_gsm_wcdma_acquisition_order_preference (MMModemMode mode, + gpointer log_object) { - gchar *str; + g_autofree gchar *str = NULL; /* mode is not a mask in this case, only a value */ @@ -1295,8 +1297,7 @@ mm_modem_mode_to_qmi_gsm_wcdma_acquisition_order_preference (MMModemMode mode) } str = mm_modem_mode_build_string_from_mask (mode); - mm_dbg ("Unhandled modem mode: '%s'", str); - g_free (str); + mm_obj_dbg (log_object, "unhandled modem mode: '%s'", str); return QMI_NAS_GSM_WCDMA_ACQUISITION_ORDER_PREFERENCE_AUTOMATIC; } diff --git a/src/mm-modem-helpers-qmi.h b/src/mm-modem-helpers-qmi.h index 319ae64b..a66b76ef 100644 --- a/src/mm-modem-helpers-qmi.h +++ b/src/mm-modem-helpers-qmi.h @@ -75,8 +75,10 @@ QmiNasRadioTechnologyPreference mm_modem_capability_to_qmi_radio_technology_pref MMModemCapability mm_modem_capability_from_qmi_band_preference (QmiNasBandPreference qmi); -MMModemMode mm_modem_mode_from_qmi_gsm_wcdma_acquisition_order_preference (QmiNasGsmWcdmaAcquisitionOrderPreference qmi); -QmiNasGsmWcdmaAcquisitionOrderPreference mm_modem_mode_to_qmi_gsm_wcdma_acquisition_order_preference (MMModemMode mode); +MMModemMode mm_modem_mode_from_qmi_gsm_wcdma_acquisition_order_preference (QmiNasGsmWcdmaAcquisitionOrderPreference qmi, + gpointer log_object); +QmiNasGsmWcdmaAcquisitionOrderPreference mm_modem_mode_to_qmi_gsm_wcdma_acquisition_order_preference (MMModemMode mode, + gpointer log_object); GArray *mm_modem_bands_from_qmi_rf_band_information_array (GArray *info_array); diff --git a/src/mm-shared-qmi.c b/src/mm-shared-qmi.c index 3faa3bd3..6d0f22e7 100644 --- a/src/mm-shared-qmi.c +++ b/src/mm-shared-qmi.c @@ -1192,7 +1192,7 @@ set_current_modes_system_selection_preference (GTask *task) if (mm_iface_modem_is_3gpp (self) && ((ctx->allowed & (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G)) == (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G))) { QmiNasGsmWcdmaAcquisitionOrderPreference order; - order = mm_modem_mode_to_qmi_gsm_wcdma_acquisition_order_preference (ctx->preferred); + order = mm_modem_mode_to_qmi_gsm_wcdma_acquisition_order_preference (ctx->preferred, self); qmi_message_nas_set_system_selection_preference_input_set_gsm_wcdma_acquisition_order_preference (input, order, NULL); } } @@ -1371,12 +1371,15 @@ load_current_modes_system_selection_preference_ready (QmiClientNas *client, GAsyncResult *res, GTask *task) { + MMSharedQmi *self; LoadCurrentModesResult *result = NULL; QmiMessageNasGetSystemSelectionPreferenceOutput *output = NULL; GError *error = NULL; QmiNasRatModePreference mode_preference_mask = 0; MMModemMode allowed; + self = g_task_get_source_object (task); + output = qmi_client_nas_get_system_selection_preference_finish (client, res, &error); if (!output || !qmi_message_nas_get_system_selection_preference_output_get_result (output, &error)) { g_task_return_error (task, error); @@ -1416,7 +1419,7 @@ load_current_modes_system_selection_preference_ready (QmiClientNas *client, output, &gsm_or_wcdma, NULL)) - result->preferred = mm_modem_mode_from_qmi_gsm_wcdma_acquisition_order_preference (gsm_or_wcdma); + result->preferred = mm_modem_mode_from_qmi_gsm_wcdma_acquisition_order_preference (gsm_or_wcdma, self); } /* Otherwise, rely on the acquisition order array TLV */ else { |