hso: started porting the High-Speed Option plugin

Just skeleton for now.

5 files changed, 328 insertions, 2 deletions

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index d5971cd1..f2741ccc 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -39,7 +39,8 @@ pkglib_LTLIBRARIES = \
 	libmm-plugin-gobi.la \
 	libmm-plugin-motorola.la \
 	libmm-plugin-novatel.la \
-	libmm-plugin-option.la
+	libmm-plugin-option.la \
+	libmm-plugin-hso.la
 
 #pkglib_LTLIBRARIES = \
 #	libmm-plugin-generic.la \
@@ -129,6 +130,17 @@ libmm_plugin_option_la_SOURCES = \
 libmm_plugin_option_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
 libmm_plugin_option_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
+# HSO
+libmm_plugin_hso_la_SOURCES = \
+	option/mm-plugin-hso.c \
+	option/mm-plugin-hso.h \
+	option/mm-broadband-modem-option.c \
+	option/mm-broadband-modem-option.h \
+	option/mm-broadband-modem-hso.c \
+	option/mm-broadband-modem-hso.h
+libmm_plugin_hso_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_hso_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
+
 ## Sierra
 #libmm_plugin_sierra_la_SOURCES = \
 #	mm-plugin-sierra.c \
@@ -293,4 +305,3 @@ libmm_plugin_novatel_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 # Additional files to include in the distribution
 EXTRA_DIST = \
 	$(udevrules_DATA)
-#	mm-modem-option-utils.c
diff --git a/plugins/option/mm-broadband-modem-hso.c b/plugins/option/mm-broadband-modem-hso.c
new file mode 100644
index 00000000..161db953
--- /dev/null
+++ b/plugins/option/mm-broadband-modem-hso.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 hso) 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 - 2012 Red Hat, Inc.
+ * Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org>
+ */
+
+#include <config.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <ctype.h>
+
+#include "ModemManager.h"
+#include "mm-modem-helpers.h"
+#include "mm-log.h"
+#include "mm-errors-types.h"
+#include "mm-base-modem-at.h"
+#include "mm-broadband-modem-hso.h"
+
+G_DEFINE_TYPE (MMBroadbandModemHso, mm_broadband_modem_hso, MM_TYPE_BROADBAND_MODEM_OPTION);
+
+struct _MMBroadbandModemHsoPrivate {
+    gpointer dummy;
+};
+
+/*****************************************************************************/
+
+MMBroadbandModemHso *
+mm_broadband_modem_hso_new (const gchar *device,
+                              const gchar *driver,
+                              const gchar *plugin,
+                              guint16 vendor_id,
+                              guint16 product_id)
+{
+    return g_object_new (MM_TYPE_BROADBAND_MODEM_HSO,
+                         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_hso_init (MMBroadbandModemHso *self)
+{
+    /* Initialize private data */
+    self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self),
+                                              MM_TYPE_BROADBAND_MODEM_HSO,
+                                              MMBroadbandModemHsoPrivate);
+}
+
+static void
+mm_broadband_modem_hso_class_init (MMBroadbandModemHsoClass *klass)
+{
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+    g_type_class_add_private (object_class, sizeof (MMBroadbandModemHsoPrivate));
+}
diff --git a/plugins/option/mm-broadband-modem-hso.h b/plugins/option/mm-broadband-modem-hso.h
new file mode 100644
index 00000000..fc244c49
--- /dev/null
+++ b/plugins/option/mm-broadband-modem-hso.h
@@ -0,0 +1,51 @@
+/* -*- 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 hso) 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 - 2012 Red Hat, Inc.
+ * Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org>
+ */
+
+#ifndef MM_BROADBAND_MODEM_HSO_H
+#define MM_BROADBAND_MODEM_HSO_H
+
+#include "mm-broadband-modem-option.h"
+
+#define MM_TYPE_BROADBAND_MODEM_HSO            (mm_broadband_modem_hso_get_type ())
+#define MM_BROADBAND_MODEM_HSO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_MODEM_HSO, MMBroadbandModemHso))
+#define MM_BROADBAND_MODEM_HSO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_BROADBAND_MODEM_HSO, MMBroadbandModemHsoClass))
+#define MM_IS_BROADBAND_MODEM_HSO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_MODEM_HSO))
+#define MM_IS_BROADBAND_MODEM_HSO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_BROADBAND_MODEM_HSO))
+#define MM_BROADBAND_MODEM_HSO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_BROADBAND_MODEM_HSO, MMBroadbandModemHsoClass))
+
+typedef struct _MMBroadbandModemHso MMBroadbandModemHso;
+typedef struct _MMBroadbandModemHsoClass MMBroadbandModemHsoClass;
+typedef struct _MMBroadbandModemHsoPrivate MMBroadbandModemHsoPrivate;
+
+struct _MMBroadbandModemHso {
+    MMBroadbandModemOption parent;
+    MMBroadbandModemHsoPrivate *priv;
+};
+
+struct _MMBroadbandModemHsoClass{
+    MMBroadbandModemOptionClass parent;
+};
+
+GType mm_broadband_modem_hso_get_type (void);
+
+MMBroadbandModemHso *mm_broadband_modem_hso_new (const gchar *device,
+                                                 const gchar *driver,
+                                                 const gchar *plugin,
+                                                 guint16 vendor_id,
+                                                 guint16 product_id);
+
+#endif /* MM_BROADBAND_MODEM_HSO_H */
diff --git a/plugins/option/mm-plugin-hso.c b/plugins/option/mm-plugin-hso.c
new file mode 100644
index 00000000..e1546671
--- /dev/null
+++ b/plugins/option/mm-plugin-hso.c
@@ -0,0 +1,150 @@
+/* -*- 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 hso) 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 - 2012 Red Hat, Inc.
+ * Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org>
+ */
+
+#include <string.h>
+#include <gmodule.h>
+
+#include <libmm-common.h>
+
+#include "mm-private-boxed-types.h"
+#include "mm-plugin-hso.h"
+#include "mm-broadband-modem-hso.h"
+
+G_DEFINE_TYPE (MMPluginHso, mm_plugin_hso, MM_TYPE_PLUGIN_BASE)
+
+int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION;
+int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
+
+/*****************************************************************************/
+
+static MMBaseModem *
+grab_port (MMPluginBase *base,
+           MMBaseModem *existing,
+           MMPortProbe *probe,
+           GError **error)
+{
+    MMBaseModem *modem = NULL;
+    GUdevDevice *port;
+    const gchar *name, *subsys, *sysfs_path;
+    guint16 vendor = 0, product = 0;
+    MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE;
+    gchar *devfile;
+
+    port = mm_port_probe_get_port (probe); /* transfer none */
+    subsys = mm_port_probe_get_port_subsys (probe);
+    name = mm_port_probe_get_port_name (probe);
+
+    if (!mm_plugin_base_get_device_ids (base, subsys, name, &vendor, &product)) {
+        g_set_error_literal (error,
+                             MM_CORE_ERROR,
+                             MM_CORE_ERROR_FAILED,
+                             "Could not get modem product ID");
+        return NULL;
+    }
+
+    /* Build proper devfile path */
+    devfile = g_strdup (g_udev_device_get_device_file (port));
+    if (!devfile) {
+        if (g_str_equal (subsys, "net")) {
+            /* Apparently 'hso' doesn't set up the right links for the netdevice,
+             * and thus libgudev can't get the sysfs file path for it.
+             */
+            devfile = g_strdup_printf ("/sys/class/net/%s", name);
+            if (!g_file_test (devfile, G_FILE_TEST_EXISTS)) {
+                g_free (devfile);
+                devfile = NULL;
+            }
+        }
+
+        if (!devfile) {
+            g_set_error (error,
+                         MM_CORE_ERROR,
+                         MM_CORE_ERROR_FAILED,
+                         "Could not get port's sysfs file.");
+            return NULL;
+        }
+    }
+
+    sysfs_path = mm_port_probe_get_port_physdev (probe);
+
+    /* Detect AT port types */
+    if (g_str_equal (subsys, "tty")) {
+        gchar *hsotype_path;
+        gchar *contents = NULL;
+
+        hsotype_path = g_build_filename (sysfs_path, "hsotype", NULL);
+        if (g_file_get_contents (hsotype_path, &contents, NULL, NULL)) {
+            if (g_str_has_prefix (contents, "Control"))
+                pflags = MM_AT_PORT_FLAG_PRIMARY;
+            else if (g_str_has_prefix (contents, "Application"))
+                pflags = MM_AT_PORT_FLAG_SECONDARY;  /* secondary */
+            g_free (contents);
+        }
+        g_free (hsotype_path);
+    }
+
+    /* If this is the first port being grabbed, create a new modem object */
+    if (!existing)
+        modem = MM_BASE_MODEM (mm_broadband_modem_hso_new (sysfs_path,
+                                                           mm_port_probe_get_port_driver (probe),
+                                                           mm_plugin_get_name (MM_PLUGIN (base)),
+                                                           vendor,
+                                                           product));
+
+    if (!mm_base_modem_grab_port (existing ? existing : modem,
+                                  subsys,
+                                  name,
+                                  mm_port_probe_get_port_type (probe),
+                                  pflags,
+                                  error)) {
+        if (modem)
+            g_object_unref (modem);
+        return NULL;
+    }
+
+    return existing ? existing : modem;
+}
+
+/*****************************************************************************/
+
+G_MODULE_EXPORT MMPlugin *
+mm_plugin_create (void)
+{
+    static const gchar *subsystems[] = { "tty", "net", NULL };
+    static const gchar *drivers[] = { "hso", NULL };
+
+    return MM_PLUGIN (
+        g_object_new (MM_TYPE_PLUGIN_HSO,
+                      MM_PLUGIN_BASE_NAME, "Option High-Speed",
+                      MM_PLUGIN_BASE_ALLOWED_SUBSYSTEMS, subsystems,
+                      MM_PLUGIN_BASE_ALLOWED_DRIVERS, drivers,
+                      MM_PLUGIN_BASE_ALLOWED_AT, TRUE,
+                      NULL));
+}
+
+static void
+mm_plugin_hso_init (MMPluginHso *self)
+{
+}
+
+static void
+mm_plugin_hso_class_init (MMPluginHsoClass *klass)
+{
+    MMPluginBaseClass *pb_class = MM_PLUGIN_BASE_CLASS (klass);
+
+    pb_class->grab_port = grab_port;
+}
diff --git a/plugins/option/mm-plugin-hso.h b/plugins/option/mm-plugin-hso.h
new file mode 100644
index 00000000..1c554a3f
--- /dev/null
+++ b/plugins/option/mm-plugin-hso.h
@@ -0,0 +1,42 @@
+/* -*- 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 hso) 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 - 2012 Red Hat, Inc.
+ * Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org>
+ */
+
+#ifndef MM_PLUGIN_HSO_H
+#define MM_PLUGIN_HSO_H
+
+#include "mm-plugin-base.h"
+
+#define MM_TYPE_PLUGIN_HSO            (mm_plugin_hso_get_type ())
+#define MM_PLUGIN_HSO(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_HSO, MMPluginHso))
+#define MM_PLUGIN_HSO_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_PLUGIN_HSO, MMPluginHsoClass))
+#define MM_IS_PLUGIN_HSO(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_HSO))
+#define MM_IS_PLUGIN_HSO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_PLUGIN_HSO))
+#define MM_PLUGIN_HSO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_PLUGIN_HSO, MMPluginHsoClass))
+
+typedef struct {
+    MMPluginBase parent;
+} MMPluginHso;
+
+typedef struct {
+    MMPluginBaseClass parent;
+} MMPluginHsoClass;
+
+GType mm_plugin_hso_get_type (void);
+
+G_MODULE_EXPORT MMPlugin *mm_plugin_create (void);
+
+#endif /* MM_PLUGIN_HSO_H */