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

modem-helpers-qmi: port acquisition order preference parser to use object logging

Browse Source
This commit is contained in:
Aleksander Morgado
2020-04-04 14:21:43 +02:00
parent f03fb06d8e
commit 07b492c887
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1257,7 +1257,8 @@ mm_modem_capability_from_qmi_band_preference (QmiNasBandPreference qmi)
/*****************************************************************************/ /*****************************************************************************/
MMModemMode 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) { switch (qmi) {
case QMI_NAS_GSM_WCDMA_ACQUISITION_ORDER_PREFERENCE_AUTOMATIC: 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: case QMI_NAS_GSM_WCDMA_ACQUISITION_ORDER_PREFERENCE_WCDMA:
return MM_MODEM_MODE_3G; return MM_MODEM_MODE_3G;
default: default:
mm_dbg ("Unknown acquisition order preference: '%s'", mm_obj_dbg (log_object, "unknown acquisition order preference: '%s'",
qmi_nas_gsm_wcdma_acquisition_order_preference_get_string (qmi)); qmi_nas_gsm_wcdma_acquisition_order_preference_get_string (qmi));
return MM_MODEM_MODE_NONE; return MM_MODEM_MODE_NONE;
} }
} }
QmiNasGsmWcdmaAcquisitionOrderPreference 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 */ /* 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); str = mm_modem_mode_build_string_from_mask (mode);
mm_dbg ("Unhandled modem mode: '%s'", str); mm_obj_dbg (log_object, "unhandled modem mode: '%s'", str);
g_free (str);
return QMI_NAS_GSM_WCDMA_ACQUISITION_ORDER_PREFERENCE_AUTOMATIC; return QMI_NAS_GSM_WCDMA_ACQUISITION_ORDER_PREFERENCE_AUTOMATIC;
} }

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

@@ -75,8 +75,10 @@ QmiNasRadioTechnologyPreference mm_modem_capability_to_qmi_radio_technology_pref
MMModemCapability mm_modem_capability_from_qmi_band_preference (QmiNasBandPreference qmi); MMModemCapability mm_modem_capability_from_qmi_band_preference (QmiNasBandPreference qmi);
MMModemMode mm_modem_mode_from_qmi_gsm_wcdma_acquisition_order_preference (QmiNasGsmWcdmaAcquisitionOrderPreference 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); 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); GArray *mm_modem_bands_from_qmi_rf_band_information_array (GArray *info_array);

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

@@ -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))) { 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; 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); 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, GAsyncResult *res,
GTask *task) GTask *task)
{ {
MMSharedQmi *self;
LoadCurrentModesResult *result = NULL; LoadCurrentModesResult *result = NULL;
QmiMessageNasGetSystemSelectionPreferenceOutput *output = NULL; QmiMessageNasGetSystemSelectionPreferenceOutput *output = NULL;
GError *error = NULL; GError *error = NULL;
QmiNasRatModePreference mode_preference_mask = 0; QmiNasRatModePreference mode_preference_mask = 0;
MMModemMode allowed; MMModemMode allowed;
self = g_task_get_source_object (task);
output = qmi_client_nas_get_system_selection_preference_finish (client, res, &error); 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)) { if (!output || !qmi_message_nas_get_system_selection_preference_output_get_result (output, &error)) {
g_task_return_error (task, error); g_task_return_error (task, error);
@@ -1416,7 +1419,7 @@ load_current_modes_system_selection_preference_ready (QmiClientNas *client,
output, output,
&gsm_or_wcdma, &gsm_or_wcdma,
NULL)) 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 */ /* Otherwise, rely on the acquisition order array TLV */
else { else {