aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/Makefile.am17
-rw-r--r--plugins/mm-plugin-simtech.c202
-rw-r--r--plugins/simtech/mm-plugin-simtech.c139
-rw-r--r--plugins/simtech/mm-plugin-simtech.h (renamed from plugins/mm-plugin-simtech.h)3
4 files changed, 149 insertions, 212 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index dab86033..037f3716 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -42,7 +42,8 @@ pkglib_LTLIBRARIES = \
libmm-plugin-option.la \
libmm-plugin-hso.la \
libmm-plugin-anydata.la \
- libmm-plugin-linktop.la
+ libmm-plugin-linktop.la \
+ libmm-plugin-simtech.la
#pkglib_LTLIBRARIES = \
# libmm-plugin-generic.la \
@@ -211,14 +212,12 @@ libmm_plugin_linktop_la_SOURCES = \
libmm_plugin_linktop_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
libmm_plugin_linktop_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
-## SimTech
-#libmm_plugin_simtech_la_SOURCES = \
-# mm-plugin-simtech.c \
-# mm-plugin-simtech.h \
-# mm-modem-simtech-gsm.c \
-# mm-modem-simtech-gsm.h
-#libmm_plugin_simtech_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
-#libmm_plugin_simtech_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
+# SimTech
+libmm_plugin_simtech_la_SOURCES = \
+ simtech/mm-plugin-simtech.c \
+ simtech/mm-plugin-simtech.h
+libmm_plugin_simtech_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_simtech_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
#
## Alcatel/TCT/JRD x220D and possibly others
#libmm_plugin_x22x_la_SOURCES = \
diff --git a/plugins/mm-plugin-simtech.c b/plugins/mm-plugin-simtech.c
deleted file mode 100644
index 1eb28229..00000000
--- a/plugins/mm-plugin-simtech.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/* -*- 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 - 2010 Red Hat, Inc.
- */
-
-#include <string.h>
-#include <gmodule.h>
-#include "mm-plugin-simtech.h"
-#include "mm-modem-simtech-gsm.h"
-#include "mm-generic-gsm.h"
-#include "mm-generic-cdma.h"
-
-G_DEFINE_TYPE (MMPluginSimtech, mm_plugin_simtech, 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_SIMTECH,
- MM_PLUGIN_BASE_NAME, "SimTech",
- 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;
- guint16 vendor = 0;
- const char *subsys, *name;
-
- /* 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;
-
- subsys = g_udev_device_get_subsystem (port);
- name = g_udev_device_get_name (port);
-
- if (!mm_plugin_base_get_device_ids (base, subsys, name, &vendor, NULL))
- return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED;
-
- /* A-Link (for now) */
- if (vendor != 0x1e0e)
- 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 *
-grab_port (MMPluginBase *base,
- MMModem *existing,
- MMPluginBaseSupportsTask *task,
- GError **error)
-{
- GUdevDevice *port = NULL;
- MMModem *modem = NULL;
- const char *name, *subsys, *sysfs_path;
- guint32 caps;
- MMPortType ptype;
- guint16 vendor = 0, product = 0;
- MMAtPortFlags pflags = MM_AT_PORT_FLAG_NONE;
-
- port = mm_plugin_base_supports_task_get_port (task);
- g_assert (port);
-
- /* Look for port type hints; just probing can't distinguish which port should
- * be the data/primary port on these devices. We have to tag them based on
- * what the Windows .INF files say the port layout should be.
- */
- if (g_udev_device_get_property_as_boolean (port, "ID_MM_SIMTECH_PORT_TYPE_MODEM"))
- pflags = MM_AT_PORT_FLAG_PRIMARY;
- else if (g_udev_device_get_property_as_boolean (port, "ID_MM_SIMTECH_PORT_TYPE_AUX"))
- pflags = MM_AT_PORT_FLAG_SECONDARY;
-
- caps = mm_plugin_base_supports_task_get_probed_capabilities (task);
- ptype = mm_plugin_base_probed_capabilities_to_port_type (caps);
-
- /* If the port was tagged by the udev rules but isn't a primary or secondary,
- * then ignore it to guard against race conditions if a device just happens
- * to show up with more than two AT-capable ports.
- */
- if ( (pflags == MM_AT_PORT_FLAG_NONE)
- && g_udev_device_get_property_as_boolean (port, "ID_MM_SIMTECH_TAGGED"))
- ptype = MM_PORT_TYPE_IGNORED;
-
- subsys = g_udev_device_get_subsystem (port);
- name = g_udev_device_get_name (port);
-
- 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;
- }
-
- sysfs_path = mm_plugin_base_supports_task_get_physdev_path (task);
- if (!existing) {
- if (caps & MM_PLUGIN_BASE_PORT_CAP_GSM) {
- modem = mm_modem_simtech_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, pflags, 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, pflags, NULL, error))
- return NULL;
- }
-
- return modem;
-}
-
-/*****************************************************************************/
-
-static void
-mm_plugin_simtech_init (MMPluginSimtech *self)
-{
- g_signal_connect (self, "probe-result", G_CALLBACK (probe_result), NULL);
-}
-
-static void
-mm_plugin_simtech_class_init (MMPluginSimtechClass *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/simtech/mm-plugin-simtech.c b/plugins/simtech/mm-plugin-simtech.c
new file mode 100644
index 00000000..8b07d325
--- /dev/null
+++ b/plugins/simtech/mm-plugin-simtech.c
@@ -0,0 +1,139 @@
+/* -*- 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 - 2012 Red Hat, Inc.
+ * Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org>
+ */
+
+#include <string.h>
+#include <gmodule.h>
+#include <libmm-common.h>
+
+#include "mm-plugin-simtech.h"
+#include "mm-broadband-modem.h"
+
+G_DEFINE_TYPE (MMPluginSimtech, mm_plugin_simtech, 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;
+ MMPortType ptype;
+ const gchar *name, *subsys;
+ guint16 vendor = 0, product = 0;
+ MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE;
+
+ /* The Simtech plugin cannot do anything with non-AT non-QCDM ports */
+ if (!mm_port_probe_is_at (probe) &&
+ !mm_port_probe_is_qcdm (probe)) {
+ g_set_error_literal (error,
+ MM_CORE_ERROR,
+ MM_CORE_ERROR_UNSUPPORTED,
+ "Ignoring non-AT non-QCDM port");
+ return NULL;
+ }
+
+ 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;
+ }
+
+ /* Look for port type hints; just probing can't distinguish which port should
+ * be the data/primary port on these devices. We have to tag them based on
+ * what the Windows .INF files say the port layout should be.
+ */
+ if (g_udev_device_get_property_as_boolean (port, "ID_MM_SIMTECH_PORT_TYPE_MODEM"))
+ pflags = MM_AT_PORT_FLAG_PRIMARY;
+ else if (g_udev_device_get_property_as_boolean (port, "ID_MM_SIMTECH_PORT_TYPE_AUX"))
+ pflags = MM_AT_PORT_FLAG_SECONDARY;
+
+ /* If the port was tagged by the udev rules but isn't a primary or secondary,
+ * then ignore it to guard against race conditions if a device just happens
+ * to show up with more than two AT-capable ports.
+ */
+ if (pflags == MM_AT_PORT_FLAG_NONE &&
+ g_udev_device_get_property_as_boolean (port, "ID_MM_SIMTECH_TAGGED"))
+ ptype = MM_PORT_TYPE_IGNORED;
+ else
+ ptype = mm_port_probe_get_port_type (probe);
+
+ /* If this is the first port being grabbed, create a new modem object */
+ if (!existing)
+ modem = MM_BASE_MODEM (mm_broadband_modem_new (mm_port_probe_get_port_physdev (probe),
+ 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,
+ ptype,
+ 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", NULL };
+ static const guint16 vendor_ids[] = { 0x1e0e, /* A-Link (for now) */
+ 0 };
+
+ return MM_PLUGIN (
+ g_object_new (MM_TYPE_PLUGIN_SIMTECH,
+ MM_PLUGIN_BASE_NAME, "SimTech",
+ MM_PLUGIN_BASE_ALLOWED_SUBSYSTEMS, subsystems,
+ MM_PLUGIN_BASE_ALLOWED_VENDOR_IDS, vendor_ids,
+ MM_PLUGIN_BASE_ALLOWED_AT, TRUE,
+ MM_PLUGIN_BASE_ALLOWED_QCDM, TRUE,
+ NULL));
+}
+
+static void
+mm_plugin_simtech_init (MMPluginSimtech *self)
+{
+}
+
+static void
+mm_plugin_simtech_class_init (MMPluginSimtechClass *klass)
+{
+ MMPluginBaseClass *pb_class = MM_PLUGIN_BASE_CLASS (klass);
+
+ pb_class->grab_port = grab_port;
+}
diff --git a/plugins/mm-plugin-simtech.h b/plugins/simtech/mm-plugin-simtech.h
index e316056d..603045e8 100644
--- a/plugins/mm-plugin-simtech.h
+++ b/plugins/simtech/mm-plugin-simtech.h
@@ -11,7 +11,8 @@
* GNU General Public License for more details:
*
* Copyright (C) 2008 - 2009 Novell, Inc.
- * Copyright (C) 2009 - 2010 Red Hat, Inc.
+ * Copyright (C) 2009 - 2012 Red Hat, Inc.
+ * Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org>
*/
#ifndef MM_PLUGIN_SIMTECH_H
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-08 16:59:24 +0000