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

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

Browse Source
This commit is contained in:
Aleksander Morgado
2020-04-08 16:35:09 +02:00
parent fc76e797d7
commit f03fb06d8e
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-modem-helpers-qmi.c
+6 -6
View File
@@ -27,7 +27,8 @@
/*****************************************************************************/
MMModemCapability
mm_modem_capability_from_qmi_radio_interface (QmiDmsRadioInterface network)
mm_modem_capability_from_qmi_radio_interface (QmiDmsRadioInterface network,
gpointer log_object)
{
switch (network) {
case QMI_DMS_RADIO_INTERFACE_CDMA20001X:
@@ -42,8 +43,7 @@ mm_modem_capability_from_qmi_radio_interface (QmiDmsRadioInterface network)
return MM_MODEM_CAPABILITY_LTE;
case QMI_DMS_RADIO_INTERFACE_5GNR:
default:
mm_warn ("Unhandled QMI radio interface (%u)",
(guint)network);
mm_obj_warn (log_object, "unhandled QMI radio interface '%u'", (guint)network);
return MM_MODEM_CAPABILITY_NONE;
}
}
@@ -51,7 +51,8 @@ mm_modem_capability_from_qmi_radio_interface (QmiDmsRadioInterface network)
/*****************************************************************************/
MMModemMode
mm_modem_mode_from_qmi_radio_interface (QmiDmsRadioInterface network)
mm_modem_mode_from_qmi_radio_interface (QmiDmsRadioInterface network,
gpointer log_object)
{
switch (network) {
case QMI_DMS_RADIO_INTERFACE_CDMA20001X:
@@ -66,8 +67,7 @@ mm_modem_mode_from_qmi_radio_interface (QmiDmsRadioInterface network)
return MM_MODEM_MODE_4G;
case QMI_DMS_RADIO_INTERFACE_5GNR:
default:
mm_warn ("Unhandled QMI radio interface (%u)",
(guint)network);
mm_obj_warn (log_object, "unhandled QMI radio interface '%u'", (guint)network);
return MM_MODEM_MODE_NONE;
}
}
src/mm-modem-helpers-qmi.h
+4 -2
View File
@@ -24,9 +24,11 @@
/*****************************************************************************/
/* QMI/DMS to MM translations */
MMModemCapability mm_modem_capability_from_qmi_radio_interface (QmiDmsRadioInterface network);
MMModemCapability mm_modem_capability_from_qmi_radio_interface (QmiDmsRadioInterface network,
gpointer log_object);
MMModemMode mm_modem_mode_from_qmi_radio_interface (QmiDmsRadioInterface network);
MMModemMode mm_modem_mode_from_qmi_radio_interface (QmiDmsRadioInterface network,
gpointer log_object);
MMModemLock mm_modem_lock_from_qmi_uim_pin_status (QmiDmsUimPinStatus status,
gboolean pin1);
src/mm-shared-qmi.c
+3 -3
View File
@@ -761,7 +761,7 @@ load_current_capabilities_get_capabilities_ready (QmiClientDms *client,
for (i = 0; i < radio_interface_list->len; i++)
ctx->capabilities_context.dms_capabilities |=
mm_modem_capability_from_qmi_radio_interface (g_array_index (radio_interface_list, QmiDmsRadioInterface, i));
mm_modem_capability_from_qmi_radio_interface (g_array_index (radio_interface_list, QmiDmsRadioInterface, i), self);
out:
if (output)
@@ -997,7 +997,7 @@ mm_shared_qmi_load_supported_capabilities (MMIfaceModem *self,
/* Build mask with all supported capabilities */
mask = MM_MODEM_CAPABILITY_NONE;
for (i = 0; i < priv->supported_radio_interfaces->len; i++)
mask |= mm_modem_capability_from_qmi_radio_interface (g_array_index (priv->supported_radio_interfaces, QmiDmsRadioInterface, i));
mask |= mm_modem_capability_from_qmi_radio_interface (g_array_index (priv->supported_radio_interfaces, QmiDmsRadioInterface, i), self);
supported_combinations = g_array_sized_new (FALSE, FALSE, sizeof (MMModemCapability), 3);
@@ -1541,7 +1541,7 @@ mm_shared_qmi_load_supported_modes (MMIfaceModem *self,
/* Build all, based on the supported radio interfaces */
mask_all = MM_MODEM_MODE_NONE;
for (i = 0; i < priv->supported_radio_interfaces->len; i++)
mask_all |= mm_modem_mode_from_qmi_radio_interface (g_array_index (priv->supported_radio_interfaces, QmiDmsRadioInterface, i));
mask_all |= mm_modem_mode_from_qmi_radio_interface (g_array_index (priv->supported_radio_interfaces, QmiDmsRadioInterface, i), self);
mode.allowed = mask_all;
mode.preferred = MM_MODEM_MODE_NONE;
all = g_array_sized_new (FALSE, FALSE, sizeof (MMModemModeCombination), 1);