diff options
| author | Aleksander Morgado <aleksandermj@chromium.org> | 2023-03-27 14:12:10 +0000 |
|---|---|---|
| committer | Aleksander Morgado <aleksandermj@chromium.org> | 2023-04-13 11:44:50 +0000 |
| commit | 585d2af713ffe4d68bfba904fa30993390f17627 (patch) | |
| tree | 510bfa72ecd05462d1a11687ccf65da720596c86 | |
| parent | 5406abc1875280f881de5cd396d369b6c459855a (diff) | |
| download | ModemManager-585d2af713ffe4d68bfba904fa30993390f17627.tar.gz | |
port-probe: simplify AT port type hints handling
When processing the hints for port probing we don't care if the AT
port is flagged as primary or secondary.
| -rw-r--r-- | src/mm-port-probe.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mm-port-probe.c b/src/mm-port-probe.c index 61b8cef3b..56a397824 100644 --- a/src/mm-port-probe.c +++ b/src/mm-port-probe.c @@ -101,9 +101,7 @@ struct _MMPortProbePrivate { gboolean is_ignored; gboolean is_gps; gboolean is_audio; - gboolean maybe_at_primary; - gboolean maybe_at_secondary; - gboolean maybe_at_ppp; + gboolean maybe_at; gboolean maybe_qcdm; gboolean maybe_qmi; gboolean maybe_mbim; @@ -1505,7 +1503,7 @@ mm_port_probe_run (MMPortProbe *self, } /* If this is a port flagged as being an AT port, don't do any other probing */ - if (self->priv->maybe_at_primary || self->priv->maybe_at_secondary || self->priv->maybe_at_ppp) { + if (self->priv->maybe_at) { mm_obj_dbg (self, "no QCDM/QMI/MBIM probing in possible AT port"); mm_port_probe_set_result_qcdm (self, FALSE); mm_port_probe_set_result_qmi (self, FALSE); @@ -1897,9 +1895,9 @@ set_property (GObject *object, self->priv->is_ignored = mm_kernel_device_get_property_as_boolean (self->priv->port, ID_MM_PORT_IGNORE); self->priv->is_gps = mm_kernel_device_get_property_as_boolean (self->priv->port, ID_MM_PORT_TYPE_GPS); self->priv->is_audio = mm_kernel_device_get_property_as_boolean (self->priv->port, ID_MM_PORT_TYPE_AUDIO); - self->priv->maybe_at_primary = mm_kernel_device_get_property_as_boolean (self->priv->port, ID_MM_PORT_TYPE_AT_PRIMARY); - self->priv->maybe_at_secondary = mm_kernel_device_get_property_as_boolean (self->priv->port, ID_MM_PORT_TYPE_AT_SECONDARY); - self->priv->maybe_at_ppp = mm_kernel_device_get_property_as_boolean (self->priv->port, ID_MM_PORT_TYPE_AT_PPP); + self->priv->maybe_at = (mm_kernel_device_get_property_as_boolean (self->priv->port, ID_MM_PORT_TYPE_AT_PRIMARY) || + mm_kernel_device_get_property_as_boolean (self->priv->port, ID_MM_PORT_TYPE_AT_SECONDARY) || + mm_kernel_device_get_property_as_boolean (self->priv->port, ID_MM_PORT_TYPE_AT_PPP)); self->priv->maybe_qcdm = mm_kernel_device_get_property_as_boolean (self->priv->port, ID_MM_PORT_TYPE_QCDM); self->priv->maybe_qmi = mm_kernel_device_get_property_as_boolean (self->priv->port, ID_MM_PORT_TYPE_QMI); self->priv->maybe_mbim = mm_kernel_device_get_property_as_boolean (self->priv->port, ID_MM_PORT_TYPE_MBIM); |