core: grab probed QCDM ports for plugins where they are useful

2010-03-23 01:36:00 -07:00
parent c36aacee0a
commit bcfb75d88d
16 changed files with 133 additions and 76 deletions
@@ -59,6 +59,8 @@ get_level_for_capabilities (guint32 capabilities)
        return 5;
    if (capabilities & CAP_CDMA)
        return 5;
+    if (capabilities & MM_PLUGIN_BASE_PORT_CAP_QCDM)
+        return 5;
    return 0;
 }

@@ -159,12 +161,15 @@ grab_port (MMPluginBase *base,
                return NULL;
            }
        }
-    } else {
-        if (caps & (MM_PLUGIN_BASE_PORT_CAP_GSM | CAP_CDMA)) {
-            modem = existing;
-            if (!mm_modem_grab_port (modem, subsys, name, MM_PORT_TYPE_UNKNOWN, NULL, error))
-                return NULL;
-        }
+    } else if (get_level_for_capabilities (caps)) {
+        MMPortType ptype = MM_PORT_TYPE_UNKNOWN;
+
+        if (caps & MM_PLUGIN_BASE_PORT_CAP_QCDM)
+            ptype = MM_PORT_TYPE_QCDM;
+
+        modem = existing;
+        if (!mm_modem_grab_port (modem, subsys, name, ptype, NULL, error))
+            return NULL;
    }

    return modem;