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

telit: don't ignore AT ports without an explicit port type hint tag

Browse Source 
The telit plugin is based on two main ways of checking the purpose of
each port: udev tags flagging specific interfaces (with info taken
from Windows .inf drivers), or otherwise using AT#PORTCFG? to query
the modem about that information. If none of those applies, the port
is ignored by default.

In order to support devices that are not explicitly tagged, the plugin
shouldn't flag as ignored the AT-capable TTYs, instead they are now
grabbed as 'secondary': ports grabbed as secondary will never be used
for either primary/data IF there is another port flagged explicitly
for primary/data.

This fixes the support for modems with a single TTY and no explicit
port type hint tag, e.g. RS232 modems with just one single TTY where
there's no point in specifying port type hints: the port will be
grabbed as secondary, and then automatically promoted to primary/data
as there is no other port grabbed.

https://bugs.freedesktop.org/show_bug.cgi?id=100159
This commit is contained in:
Aleksander Morgado
2017-03-06 13:56:19 +01:00
parent 875ade3e41
commit 60be293fa5
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/telit/mm-common-telit.c
View File

@@ -84,10 +84,21 @@ telit_grab_port (MMPlugin *self,
} else } else
ptype = MM_PORT_TYPE_IGNORED; ptype = MM_PORT_TYPE_IGNORED;
} else { } else {
/* If the port was tagged by the udev rules but isn't a primary or secondary, /* If the port isn't explicitly tagged as primary, secondary, or gps
* then ignore it to guard against race conditions if a device just happens * port, we will fallback to flagging it as secondary, but only if it
* to show up with more than two AT-capable ports. * probed AT successfully.
*
* This is so that we support the case where a single TTY is exposed
* by the modem and no explicit port type hint is specified.
*
* From the modem point of view, only the AT_FLAG_PRIMARY would be
* important, as that is the port that would end up getting used for PPP
* in this case, so having multiple secondary ports, if that ever
* happened, wouldn't be an issue.
*/ */
if (mm_port_probe_is_at (probe))
pflags = MM_PORT_SERIAL_AT_FLAG_SECONDARY;
else
ptype = MM_PORT_TYPE_IGNORED; ptype = MM_PORT_TYPE_IGNORED;
} }