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

generic: allow QCDM ports

Browse Source
This commit is contained in:
Aleksander Morgado
2011-12-31 14:59:36 +01:00
parent def30139d7
commit 41bf841334
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/mm-plugin-generic.c
View File

@@ -52,9 +52,10 @@ grab_port (MMPluginBase *base,
subsys = mm_port_probe_get_port_subsys (probe); subsys = mm_port_probe_get_port_subsys (probe);
name = mm_port_probe_get_port_name (probe); name = mm_port_probe_get_port_name (probe);
/* The generic plugin cannot do anything with non-AT ports */ /* The generic plugin cannot do anything with non-AT and non-QCDM ports */
if (!mm_port_probe_is_at (probe)) { if (!mm_port_probe_is_at (probe) &&
g_set_error (error, 0, 0, "Ignoring non-AT port"); !mm_port_probe_is_qcdm (probe)) {
g_set_error (error, 0, 0, "Ignoring non-AT/non-QCDM ports");
return NULL; return NULL;
} }
@@ -91,7 +92,9 @@ grab_port (MMPluginBase *base,
if (!mm_base_modem_grab_port (existing ? existing : modem, if (!mm_base_modem_grab_port (existing ? existing : modem,
subsys, subsys,
name, name,
MM_PORT_TYPE_UNKNOWN)) { (mm_port_probe_is_qcdm (probe) ?
MM_PORT_TYPE_QCDM :
MM_PORT_TYPE_UNKNOWN))) {
if (modem) if (modem)
g_object_unref (modem); g_object_unref (modem);
return NULL; return NULL;
@@ -112,6 +115,7 @@ mm_plugin_create (void)
MM_PLUGIN_BASE_NAME, MM_PLUGIN_GENERIC_NAME, MM_PLUGIN_BASE_NAME, MM_PLUGIN_GENERIC_NAME,
MM_PLUGIN_BASE_ALLOWED_SUBSYSTEMS, subsystems, MM_PLUGIN_BASE_ALLOWED_SUBSYSTEMS, subsystems,
MM_PLUGIN_BASE_ALLOWED_AT, TRUE, MM_PLUGIN_BASE_ALLOWED_AT, TRUE,
MM_PLUGIN_BASE_ALLOWED_QCDM, TRUE,
NULL)); NULL));
} }
@@ -127,4 +131,3 @@ mm_plugin_generic_class_init (MMPluginGenericClass *klass)
pb_class->grab_port = grab_port; pb_class->grab_port = grab_port;
} }