gobi: port to 06-api

5 files changed, 182 insertions, 133 deletions

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 664f361b..45e7e594 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -34,12 +34,12 @@ PLUGIN_COMMON_LINKER_FLAGS = \
 pkglib_LTLIBRARIES = \
 	libmm-plugin-generic.la \
 	libmm-plugin-cinterion.la \
-	libmm-plugin-nokia.la
+	libmm-plugin-nokia.la \
+	libmm-plugin-gobi.la
 
 #pkglib_LTLIBRARIES = \
 #	libmm-plugin-generic.la \
 #	libmm-plugin-moto-c.la \
-#	libmm-plugin-gobi.la \
 #	libmm-plugin-huawei.la \
 #	libmm-plugin-hso.la \
 #	libmm-plugin-option.la \
@@ -73,14 +73,16 @@ libmm_plugin_generic_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 #libmm_plugin_moto_c_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
 #libmm_plugin_moto_c_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 #
-## Qualcomm Gobi
-#libmm_plugin_gobi_la_SOURCES = \
-#	mm-plugin-gobi.c \
-#	mm-plugin-gobi.h \
-#	mm-modem-gobi-gsm.c \
-#	mm-modem-gobi-gsm.h
-#libmm_plugin_gobi_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-#libmm_plugin_gobi_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
+
+# Gobi
+libmm_plugin_gobi_la_SOURCES = \
+	mm-plugin-gobi.c \
+	mm-plugin-gobi.h \
+	mm-broadband-modem-gobi.c \
+	mm-broadband-modem-gobi.h
+libmm_plugin_gobi_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_gobi_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
+
 #
 ## Huawei
 #libmm_plugin_huawei_la_SOURCES = \
diff --git a/plugins/mm-broadband-modem-gobi.c b/plugins/mm-broadband-modem-gobi.c
new file mode 100644
index 00000000..6d4f505b
--- /dev/null
+++ b/plugins/mm-broadband-modem-gobi.c
@@ -0,0 +1,72 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details:
+ *
+ * Copyright (C) 2008 - 2009 Novell, Inc.
+ * Copyright (C) 2009 - 2011 Red Hat, Inc.
+ * Copyright (C) 2011 Google Inc.
+ */
+
+#include <config.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <ctype.h>
+
+#include "ModemManager.h"
+#include "mm-serial-parsers.h"
+#include "mm-log.h"
+#include "mm-errors-types.h"
+#include "mm-iface-modem.h"
+#include "mm-base-modem-at.h"
+#include "mm-broadband-modem-gobi.h"
+
+static void iface_modem_init (MMIfaceModem *iface);
+
+G_DEFINE_TYPE_EXTENDED (MMBroadbandModemGobi, mm_broadband_modem_gobi, MM_TYPE_BROADBAND_MODEM, 0,
+                        G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init));
+
+/*****************************************************************************/
+
+MMBroadbandModemGobi *
+mm_broadband_modem_gobi_new (const gchar *device,
+                             const gchar *driver,
+                             const gchar *plugin,
+                             guint16 vendor_id,
+                             guint16 product_id)
+{
+    return g_object_new (MM_TYPE_BROADBAND_MODEM_GOBI,
+                         MM_BASE_MODEM_DEVICE, device,
+                         MM_BASE_MODEM_DRIVER, driver,
+                         MM_BASE_MODEM_PLUGIN, plugin,
+                         MM_BASE_MODEM_VENDOR_ID, vendor_id,
+                         MM_BASE_MODEM_PRODUCT_ID, product_id,
+                         NULL);
+}
+
+static void
+mm_broadband_modem_gobi_init (MMBroadbandModemGobi *self)
+{
+}
+
+static void
+iface_modem_init (MMIfaceModem *iface)
+{
+    iface->modem_power_down = NULL;
+    iface->modem_power_down_finish = NULL;
+}
+
+static void
+mm_broadband_modem_gobi_class_init (MMBroadbandModemGobiClass *klass)
+{
+}
diff --git a/plugins/mm-broadband-modem-gobi.h b/plugins/mm-broadband-modem-gobi.h
new file mode 100644
index 00000000..844fd80f
--- /dev/null
+++ b/plugins/mm-broadband-modem-gobi.h
@@ -0,0 +1,49 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details:
+ *
+ * Copyright (C) 2008 - 2009 Novell, Inc.
+ * Copyright (C) 2009 - 2011 Red Hat, Inc.
+ * Copyright (C) 2011 Google Inc.
+ */
+
+#ifndef MM_BROADBAND_MODEM_GOBI_H
+#define MM_BROADBAND_MODEM_GOBI_H
+
+#include "mm-broadband-modem.h"
+
+#define MM_TYPE_BROADBAND_MODEM_GOBI            (mm_broadband_modem_gobi_get_type ())
+#define MM_BROADBAND_MODEM_GOBI(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_MODEM_GOBI, MMBroadbandModemGobi))
+#define MM_BROADBAND_MODEM_GOBI_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_BROADBAND_MODEM_GOBI, MMBroadbandModemGobiClass))
+#define MM_IS_BROADBAND_MODEM_GOBI(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_MODEM_GOBI))
+#define MM_IS_BROADBAND_MODEM_GOBI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_BROADBAND_MODEM_GOBI))
+#define MM_BROADBAND_MODEM_GOBI_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_BROADBAND_MODEM_GOBI, MMBroadbandModemGobiClass))
+
+typedef struct _MMBroadbandModemGobi MMBroadbandModemGobi;
+typedef struct _MMBroadbandModemGobiClass MMBroadbandModemGobiClass;
+
+struct _MMBroadbandModemGobi {
+    MMBroadbandModem parent;
+};
+
+struct _MMBroadbandModemGobiClass{
+    MMBroadbandModemClass parent;
+};
+
+GType mm_broadband_modem_gobi_get_type (void);
+
+MMBroadbandModemGobi *mm_broadband_modem_gobi_new (const gchar *device,
+                                                   const gchar *driver,
+                                                   const gchar *plugin,
+                                                   guint16 vendor_id,
+                                                   guint16 product_id);
+
+#endif /* MM_BROADBAND_MODEM_GOBI_H */
diff --git a/plugins/mm-plugin-gobi.c b/plugins/mm-plugin-gobi.c
index 997c3836..e70278b8 100644
--- a/plugins/mm-plugin-gobi.c
+++ b/plugins/mm-plugin-gobi.c
@@ -11,161 +11,90 @@
  * GNU General Public License for more details:
  *
  * Copyright (C) 2008 - 2009 Novell, Inc.
- * Copyright (C) 2009 Red Hat, Inc.
+ * Copyright (C) 2011 Red Hat, Inc.
  */
 
 #include <string.h>
 #include <gmodule.h>
-#define G_UDEV_API_IS_SUBJECT_TO_CHANGE
-#include <gudev/gudev.h>
+
+#include <mm-errors-types.h>
 
 #include "mm-plugin-gobi.h"
-#include "mm-modem-gobi-gsm.h"
-#include "mm-generic-cdma.h"
+#include "mm-broadband-modem-gobi.h"
 
 G_DEFINE_TYPE (MMPluginGobi, mm_plugin_gobi, MM_TYPE_PLUGIN_BASE)
 
 int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
 int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
 
-G_MODULE_EXPORT MMPlugin *
-mm_plugin_create (void)
-{
-    return MM_PLUGIN (g_object_new (MM_TYPE_PLUGIN_GOBI,
-                                    MM_PLUGIN_BASE_NAME, "Gobi",
-                                    NULL));
-}
-
 /*****************************************************************************/
 
-#define CAP_CDMA (MM_PLUGIN_BASE_PORT_CAP_IS707_A | \
-                  MM_PLUGIN_BASE_PORT_CAP_IS707_P | \
-                  MM_PLUGIN_BASE_PORT_CAP_IS856 | \
-                  MM_PLUGIN_BASE_PORT_CAP_IS856_A)
-
-static guint32
-get_level_for_capabilities (guint32 capabilities)
-{
-    if (capabilities & MM_PLUGIN_BASE_PORT_CAP_GSM)
-        return 10;
-    if (capabilities & CAP_CDMA)
-        return 10;
-    if (capabilities & MM_PLUGIN_BASE_PORT_CAP_QCDM)
-        return 10;
-    return 0;
-}
-
-static void
-probe_result (MMPluginBase *base,
-              MMPluginBaseSupportsTask *task,
-              guint32 capabilities,
-              gpointer user_data)
-{
-    mm_plugin_base_supports_task_complete (task, get_level_for_capabilities (capabilities));
-}
-
-static MMPluginSupportsResult
-supports_port (MMPluginBase *base,
-               MMModem *existing,
-               MMPluginBaseSupportsTask *task)
-{
-    GUdevDevice *port;
-    const char *driver;
-
-    /* Can't do anything with non-serial ports */
-    port = mm_plugin_base_supports_task_get_port (task);
-    if (strcmp (g_udev_device_get_subsystem (port), "tty"))
-        return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED;
-
-    driver = mm_plugin_base_supports_task_get_driver (task);
-    if (!driver || strcmp (driver, "qcserial"))
-        return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED;
-
-        /* Check if a previous probing was already launched in this port */
-    if (mm_plugin_base_supports_task_propagate_cached (task)) {
-        guint32 level;
-
-        /* A previous probing was already done, use its results */
-        level = get_level_for_capabilities (mm_plugin_base_supports_task_get_probed_capabilities (task));
-        if (level) {
-            mm_plugin_base_supports_task_complete (task, level);
-            return MM_PLUGIN_SUPPORTS_PORT_IN_PROGRESS;
-        }
-        return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED;
-    }
-
-    /* Otherwise kick off a probe */
-    if (mm_plugin_base_probe_port (base, task, 100000, NULL))
-        return MM_PLUGIN_SUPPORTS_PORT_IN_PROGRESS;
-
-    return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED;
-}
-
-static MMModem *
+static MMBaseModem *
 grab_port (MMPluginBase *base,
-           MMModem *existing,
-           MMPluginBaseSupportsTask *task,
+           MMBaseModem *existing,
+           MMPortProbe *probe,
            GError **error)
 {
-    GUdevDevice *port = NULL;
-    MMModem *modem = NULL;
-    const char *name, *subsys, *sysfs_path;
-    guint32 caps;
+    MMBaseModem *modem = NULL;
+    const gchar *name, *subsys, *driver;
     guint16 vendor = 0, product = 0;
-    MMPortType ptype;
 
-    port = mm_plugin_base_supports_task_get_port (task);
-    g_assert (port);
+    /* The Gobi plugin only handles AT and QCDM ports (for now) */
+    if (!mm_port_probe_is_at (probe) && !mm_port_probe_is_qcdm (probe)) {
+        g_set_error (error, 0, 0, "Ignoring non-AT/non-QCDM port");
+        return NULL;
+    }
 
-    subsys = g_udev_device_get_subsystem (port);
-    name = g_udev_device_get_name (port);
+    subsys = mm_port_probe_get_port_subsys (probe);
+    name = mm_port_probe_get_port_name (probe);
+    driver = mm_port_probe_get_port_driver (probe);
 
     if (!mm_plugin_base_get_device_ids (base, subsys, name, &vendor, &product)) {
         g_set_error (error, 0, 0, "Could not get modem product ID.");
         return NULL;
     }
 
-    caps = mm_plugin_base_supports_task_get_probed_capabilities (task);
-    ptype = mm_plugin_base_probed_capabilities_to_port_type (caps);
-    sysfs_path = mm_plugin_base_supports_task_get_physdev_path (task);
-    if (!existing) {
-        if (caps & MM_PLUGIN_BASE_PORT_CAP_GSM) {
-            modem = mm_modem_gobi_gsm_new (sysfs_path,
-                                           mm_plugin_base_supports_task_get_driver (task),
-                                           mm_plugin_get_name (MM_PLUGIN (base)),
-                                           vendor,
-                                           product);
-        } else if (caps & CAP_CDMA) {
-            modem = mm_generic_cdma_new (sysfs_path,
-                                         mm_plugin_base_supports_task_get_driver (task),
-                                         mm_plugin_get_name (MM_PLUGIN (base)),
-                                         !!(caps & MM_PLUGIN_BASE_PORT_CAP_IS856),
-                                         !!(caps & MM_PLUGIN_BASE_PORT_CAP_IS856_A),
-                                         vendor,
-                                         product);
-        }
-
-        if (modem) {
-            if (!mm_modem_grab_port (modem, subsys, name, ptype, MM_AT_PORT_FLAG_NONE, NULL, error)) {
-                g_object_unref (modem);
-                return NULL;
-            }
-        }
-    } else if (get_level_for_capabilities (caps)) {
-        modem = existing;
-        if (!mm_modem_grab_port (modem, subsys, name, ptype, MM_AT_PORT_FLAG_NONE, NULL, error))
-            return NULL;
+    /* If this is the first port being grabbed, create a new modem object */
+    if (!existing)
+        modem = MM_BASE_MODEM (mm_broadband_modem_gobi_new (mm_port_probe_get_port_physdev (probe),
+                                                            driver,
+                                                            mm_plugin_get_name (MM_PLUGIN (base)),
+                                                            vendor,
+                                                            product));
+
+    if (!mm_base_modem_grab_port (existing ? existing : modem,
+                                  subsys,
+                                  name,
+                                  MM_PORT_TYPE_UNKNOWN)) {
+        if (modem)
+            g_object_unref (modem);
+        return NULL;
     }
 
-    return modem;
+    return existing ? existing : modem;
 }
 
 /*****************************************************************************/
 
+G_MODULE_EXPORT MMPlugin *
+mm_plugin_create (void)
+{
+    static const gchar *subsystems[] = { "tty", NULL };
+    static const gchar *drivers[] = { "qcserial", NULL };
+
+    return MM_PLUGIN (
+        g_object_new (MM_TYPE_PLUGIN_GOBI,
+                      MM_PLUGIN_BASE_NAME, "Gobi",
+                      MM_PLUGIN_BASE_ALLOWED_SUBSYSTEMS, subsystems,
+                      MM_PLUGIN_BASE_ALLOWED_DRIVERS, drivers,
+                      MM_PLUGIN_BASE_ALLOWED_AT, TRUE,
+                      MM_PLUGIN_BASE_ALLOWED_QCDM, TRUE,
+                      NULL));
+}
+
 static void
 mm_plugin_gobi_init (MMPluginGobi *self)
 {
-    g_signal_connect (self, "probe-result", G_CALLBACK (probe_result), NULL);
 }
 
 static void
@@ -173,7 +102,6 @@ mm_plugin_gobi_class_init (MMPluginGobiClass *klass)
 {
     MMPluginBaseClass *pb_class = MM_PLUGIN_BASE_CLASS (klass);
 
-    pb_class->supports_port = supports_port;
     pb_class->grab_port = grab_port;
 }
 
diff --git a/plugins/mm-plugin-gobi.h b/plugins/mm-plugin-gobi.h
index aceba6b0..6c63d9c5 100644
--- a/plugins/mm-plugin-gobi.h
+++ b/plugins/mm-plugin-gobi.h
@@ -17,9 +17,7 @@
 #ifndef MM_PLUGIN_GOBI_H
 #define MM_PLUGIN_GOBI_H
 
-#include "mm-plugin.h"
 #include "mm-plugin-base.h"
-#include "mm-generic-gsm.h"
 
 #define MM_TYPE_PLUGIN_GOBI            (mm_plugin_gobi_get_type ())
 #define MM_PLUGIN_GOBI(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_GOBI, MMPluginGobi))