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

port-probe: explicitly report GPS port type if port flagged

Browse Source 
And remove all custom logic from all plugins that were doing just that.
This commit is contained in:
Aleksander Morgado
2018-08-10 04:19:13 +00:00
committed by Dan Williams
parent 9c0a557f91
commit 86f840d97b
5 changed files with 3 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/cinterion/mm-plugin-cinterion.c
-8
View File
@@ -152,14 +152,6 @@ grab_port (MMPlugin *self,
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
pflags = MM_PORT_SERIAL_AT_FLAG_PPP;
} else if (mm_kernel_device_get_property_as_boolean (mm_port_probe_peek_port (probe),
"ID_MM_PORT_TYPE_GPS")) {
mm_dbg ("(%s/%s)' Port flagged as GPS",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
/* Not an AT port, but the port to grab GPS traces */
g_warn_if_fail (ptype == MM_PORT_TYPE_UNKNOWN);
ptype = MM_PORT_TYPE_GPS;
}
return mm_base_modem_grab_port (modem,
plugins/huawei/mm-plugin-huawei.c
-5
View File
@@ -542,11 +542,6 @@ grab_port (MMPlugin *self,
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
pflags = MM_PORT_SERIAL_AT_FLAG_PPP;
} else if (mm_kernel_device_get_property_as_boolean (port, "ID_MM_PORT_TYPE_GPS")) {
mm_dbg ("(%s/%s) Port flagged as GPS",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
port_type = MM_PORT_TYPE_GPS;
} else {
gchar *str;
plugins/mbm/mm-plugin-mbm.c
-29
View File
@@ -65,33 +65,6 @@ create_modem (MMPlugin *self,
product));
}
static gboolean
grab_port (MMPlugin *self,
MMBaseModem *modem,
MMPortProbe *probe,
GError **error)
{
MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE;
MMKernelDevice *port;
MMPortType port_type;
port_type = mm_port_probe_get_port_type (probe);
port = mm_port_probe_peek_port (probe);
if (mm_kernel_device_get_property_as_boolean (port, "ID_MM_PORT_TYPE_GPS")) {
mm_dbg ("(%s/%s) Port flagged as GPS",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
port_type = MM_PORT_TYPE_GPS;
}
return mm_base_modem_grab_port (modem,
port,
port_type,
pflags,
error);
}
/*****************************************************************************/
G_MODULE_EXPORT MMPlugin *
@@ -124,6 +97,4 @@ mm_plugin_mbm_class_init (MMPluginMbmClass *klass)
MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass);
plugin_class->create_modem = create_modem;
plugin_class->grab_port = grab_port;
}
plugins/telit/mm-common-telit.c
-5
View File
@@ -66,11 +66,6 @@ telit_grab_port (MMPlugin *self,
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
pflags = MM_PORT_SERIAL_AT_FLAG_SECONDARY;
} else if (mm_kernel_device_get_property_as_boolean (port, "ID_MM_PORT_TYPE_GPS")) {
mm_dbg ("telit: port '%s/%s' flagged as NMEA",
mm_port_probe_get_port_subsys (probe),
mm_port_probe_get_port_name (probe));
ptype = MM_PORT_TYPE_GPS;
} else if (g_object_get_data (G_OBJECT (device), TAG_GETPORTCFG_SUPPORTED) != NULL) {
if (g_strcmp0 (mm_kernel_device_get_property (port, "ID_USB_INTERFACE_NUM"), g_object_get_data (G_OBJECT (device), TAG_TELIT_MODEM_PORT)) == 0) {
mm_dbg ("telit: AT port '%s/%s' flagged as primary",
src/mm-port-probe.c
+3
View File
@@ -1596,6 +1596,9 @@ mm_port_probe_get_port_type (MMPortProbe *self)
self->priv->is_at)
return MM_PORT_TYPE_AT;
if (self->priv->is_gps)
return MM_PORT_TYPE_GPS;
return MM_PORT_TYPE_UNKNOWN;
}