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

plugin-base: avoid launching AT probing on new ports if the modem expects only one

Browse Source 
If we got an existing modem showing a new port, and the plugin handling that modem
said that only one AT port was expected, we shouldn't be AT-probing it any more.
This commit is contained in:
Aleksander Morgado
2012-03-13 18:20:01 +01:00
parent 29f23f2a49
commit 15e9943036
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mm-plugin-base.c
View File

@@ -680,7 +680,7 @@ supports_port (MMPlugin *plugin,
} }
/* Build flags depending on what probing needed */ /* Build flags depending on what probing needed */
probe_run_flags = 0; probe_run_flags = MM_PORT_PROBE_NONE;
if (priv->at) if (priv->at)
probe_run_flags |= MM_PORT_PROBE_AT; probe_run_flags |= MM_PORT_PROBE_AT;
else if (priv->single_at) else if (priv->single_at)
@@ -691,8 +691,24 @@ supports_port (MMPlugin *plugin,
probe_run_flags |= (MM_PORT_PROBE_AT | MM_PORT_PROBE_AT_PRODUCT); probe_run_flags |= (MM_PORT_PROBE_AT | MM_PORT_PROBE_AT_PRODUCT);
if (priv->qcdm) if (priv->qcdm)
probe_run_flags |= MM_PORT_PROBE_QCDM; probe_run_flags |= MM_PORT_PROBE_QCDM;
g_assert (probe_run_flags != MM_PORT_PROBE_NONE); g_assert (probe_run_flags != MM_PORT_PROBE_NONE);
/* If a modem is already available and the plugin says that only one AT port is
* expected, check if we alredy got the single AT port. And if so, we know this
* port being probed won't be AT. */
if (priv->single_at &&
existing &&
mm_base_modem_has_at_port (existing)) {
mm_dbg ("(%s) not setting up AT probing tasks for (%s,%s): "
"modem already has the expected single AT port",
priv->name, subsys, name);
/* Assuming it won't be an AT port. We still run the probe anyway, in
* case we need to check for other port types (e.g. QCDM) */
mm_port_probe_set_result_at (probe, FALSE);
}
/* Setup async call context */ /* Setup async call context */
ctx = g_new (PortProbeRunContext, 1); ctx = g_new (PortProbeRunContext, 1);
ctx->plugin = g_object_ref (self); ctx->plugin = g_object_ref (self);