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

port-qmi: use a single method to set all initial net port details

Browse Source
This commit is contained in:
Aleksander Morgado
2024-01-25 13:45:14 +00:00
committed by Aleksander Morgado
parent 99f520269b
commit 910e450ea7
3 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-base-modem.c
+2 -10
View File
@@ -1633,16 +1633,8 @@ mm_base_modem_organize_ports (MMBaseModem *self,
g_assert (MM_IS_PORT_NET (self->priv->data->data));
/* let the MMPortQmi know which net driver is being used, taken
* from the first item in the net port list */
g_list_foreach (qmi,
(GFunc)mm_port_qmi_set_net_driver,
(gpointer) mm_kernel_device_get_driver (
mm_port_peek_kernel_device (
MM_PORT (self->priv->data->data))));
g_list_foreach (qmi,
(GFunc)mm_port_qmi_set_net_sysfs_path,
(gpointer) mm_kernel_device_get_sysfs_path (
mm_port_peek_kernel_device (
MM_PORT (self->priv->data->data))));
g_list_foreach (qmi, (GFunc)mm_port_qmi_set_net_details, (gpointer) MM_PORT (self->priv->data->data));
g_list_foreach (qmi, (GFunc)g_object_ref, NULL);
self->priv->qmi = g_steal_pointer (&qmi);
}
src/mm-port-qmi.c
+13 -13
View File
@@ -2652,26 +2652,26 @@ mm_port_qmi_is_open (MMPortQmi *self)
}
/*****************************************************************************/
/* Sets network details that the QMI port should be aware of before even
* a data connection is started. */
void
mm_port_qmi_set_net_driver (MMPortQmi *self,
const gchar *net_driver)
mm_port_qmi_set_net_details (MMPortQmi *self,
MMPort *first_net)
{
MMKernelDevice *first_net_dev;
first_net_dev = mm_port_peek_kernel_device (first_net);
g_assert (MM_IS_PORT_QMI (self));
g_assert (!self->priv->net_driver);
self->priv->net_driver = g_strdup (net_driver);
initialize_endpoint_info (self);
}
self->priv->net_driver = g_strdup (mm_kernel_device_get_driver (first_net_dev));
/*****************************************************************************/
void
mm_port_qmi_set_net_sysfs_path (MMPortQmi *self,
const gchar *net_sysfs_path)
{
g_assert (MM_IS_PORT_QMI (self));
g_assert (!self->priv->net_sysfs_path);
self->priv->net_sysfs_path = g_strdup (net_sysfs_path);
self->priv->net_sysfs_path = g_strdup (mm_kernel_device_get_sysfs_path (first_net_dev));
initialize_endpoint_info (self);
}
/*****************************************************************************/
src/mm-port-qmi.h
+2 -5
View File
@@ -88,11 +88,8 @@ gboolean mm_port_qmi_close_finish (MMPortQmi *self,
GAsyncResult *res,
GError **error);
void mm_port_qmi_set_net_driver (MMPortQmi *self,
const gchar *net_driver);
void mm_port_qmi_set_net_sysfs_path (MMPortQmi *self,
const gchar *net_sysfs_path);
void mm_port_qmi_set_net_details (MMPortQmi *self,
MMPort *first_net);
typedef enum {
MM_PORT_QMI_FLAG_DEFAULT = 0,