broadband-modem-qmi: choose endpoint number based on data port

At the moment the endpoint type/number is chosen based on the QMI
control port. The assumption is that multiplexing is implemented using
an additional protocol layer (e.g. QMAP) or that each network interface
has its own QMI control port.

This is not necessarily the case for BAM-DMUX. To use the built-in
multiplexing the WDS client must be bound to the correct data port.
This works already for older firmware versions using "Bind Data Port"
(SIO port numbers), but not for newer ones using "Bind Mux Data Port"
(endpoint type/interface numbers).

Make it work for newer firmware versions as well by choosing the
endpoint type/number based on the data port similar to the existing
implementation for SIO port numbers.

Note: The correct endpoint interface number is currently only used for
the steps in mm-bearer-qmi. Ideally more refactoring should be done in
mm-port-qmi to call WDA Set Data Format for each of the endpoints.
In practice it usually works fine without because the data format is
set correctly by default.

1 files changed, 13 insertions, 13 deletions

diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c
index 9619acb6..89edd3bc 100644
--- a/src/mm-broadband-modem-qmi.c
+++ b/src/mm-broadband-modem-qmi.c
@@ -248,14 +248,14 @@ mm_broadband_modem_qmi_peek_port_qmi (MMBroadbandModemQmi *self)
 MMPortQmi *
 mm_broadband_modem_qmi_get_port_qmi_for_data (MMBroadbandModemQmi  *self,
                                               MMPort               *data,
-                                              QmiSioPort           *out_sio_port,
+                                              MMQmiDataEndpoint    *out_endpoint,
                                               GError              **error)
 {
     MMPortQmi *qmi_port;
 
     g_assert (MM_IS_BROADBAND_MODEM_QMI (self));
 
-    qmi_port = mm_broadband_modem_qmi_peek_port_qmi_for_data (self, data, out_sio_port, error);
+    qmi_port = mm_broadband_modem_qmi_peek_port_qmi_for_data (self, data, out_endpoint, error);
     return (qmi_port ?
             MM_PORT_QMI (g_object_ref (qmi_port)) :
             NULL);
@@ -264,7 +264,7 @@ mm_broadband_modem_qmi_get_port_qmi_for_data (MMBroadbandModemQmi  *self,
 static MMPortQmi *
 peek_port_qmi_for_data_mhi (MMBroadbandModemQmi  *self,
                             MMPort               *data,
-                            QmiSioPort           *out_sio_port,
+                            MMQmiDataEndpoint    *out_endpoint,
                             GError              **error)
 {
     MMPortQmi *found = NULL;
@@ -277,8 +277,8 @@ peek_port_qmi_for_data_mhi (MMBroadbandModemQmi  *self,
                      MM_CORE_ERROR_NOT_FOUND,
                      "Couldn't find associated QMI port for 'net/%s'",
                      mm_port_get_device (data));
-    else if (out_sio_port)
-        *out_sio_port = QMI_SIO_PORT_NONE;
+    else if (out_endpoint)
+        mm_port_qmi_get_endpoint_info (found, out_endpoint);
 
     return found;
 }
@@ -286,7 +286,7 @@ peek_port_qmi_for_data_mhi (MMBroadbandModemQmi  *self,
 static MMPortQmi *
 peek_port_qmi_for_data_usb (MMBroadbandModemQmi  *self,
                             MMPort               *data,
-                            QmiSioPort           *out_sio_port,
+                            MMQmiDataEndpoint    *out_endpoint,
                             GError              **error)
 {
     GList       *cdc_wdm_qmi_ports;
@@ -325,8 +325,8 @@ peek_port_qmi_for_data_usb (MMBroadbandModemQmi  *self,
                      MM_CORE_ERROR_NOT_FOUND,
                      "Couldn't find associated QMI port for 'net/%s'",
                      mm_port_get_device (data));
-    else if (out_sio_port)
-        *out_sio_port = QMI_SIO_PORT_NONE;
+    else if (out_endpoint)
+        mm_port_qmi_get_endpoint_info (found, out_endpoint);
 
     return found;
 }
@@ -335,7 +335,7 @@ peek_port_qmi_for_data_usb (MMBroadbandModemQmi  *self,
 static MMPortQmi *
 peek_port_qmi_for_data (MMBroadbandModemQmi  *self,
                         MMPort               *data,
-                        QmiSioPort           *out_sio_port,
+                        MMQmiDataEndpoint    *out_endpoint,
                         GError              **error)
 {
     const gchar *net_port_driver;
@@ -346,10 +346,10 @@ peek_port_qmi_for_data (MMBroadbandModemQmi  *self,
     net_port_driver = mm_kernel_device_get_driver (mm_port_peek_kernel_device (data));
 
     if (!g_strcmp0 (net_port_driver, "qmi_wwan"))
-        return peek_port_qmi_for_data_usb (self, data, out_sio_port, error);
+        return peek_port_qmi_for_data_usb (self, data, out_endpoint, error);
 
     if (!g_strcmp0 (net_port_driver, "mhi_net"))
-        return peek_port_qmi_for_data_mhi (self, data, out_sio_port, error);
+        return peek_port_qmi_for_data_mhi (self, data, out_endpoint, error);
 
     g_set_error (error,
                  MM_CORE_ERROR,
@@ -363,12 +363,12 @@ peek_port_qmi_for_data (MMBroadbandModemQmi  *self,
 MMPortQmi *
 mm_broadband_modem_qmi_peek_port_qmi_for_data (MMBroadbandModemQmi  *self,
                                                MMPort               *data,
-                                               QmiSioPort           *out_sio_port,
+                                               MMQmiDataEndpoint    *out_endpoint,
                                                GError              **error)
 {
     g_assert (MM_BROADBAND_MODEM_QMI_GET_CLASS (self)->peek_port_qmi_for_data);
 
-    return MM_BROADBAND_MODEM_QMI_GET_CLASS (self)->peek_port_qmi_for_data (self, data, out_sio_port, error);
+    return MM_BROADBAND_MODEM_QMI_GET_CLASS (self)->peek_port_qmi_for_data (self, data, out_endpoint, error);
 }
 
 /*****************************************************************************/