From c345f5fe6361f7659c93c31502fbcbced32c99a9 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Thu, 1 Dec 2011 20:20:26 +0100 Subject: cinterion: re-enabled Cinterion plugin Just dummy plugin for now. --- plugins/mm-plugin-cinterion.c | 218 +++++++++++------------------------------- 1 file changed, 54 insertions(+), 164 deletions(-) (limited to 'plugins/mm-plugin-cinterion.c') diff --git a/plugins/mm-plugin-cinterion.c b/plugins/mm-plugin-cinterion.c index 9d0fb529..d1e5fb76 100644 --- a/plugins/mm-plugin-cinterion.c +++ b/plugins/mm-plugin-cinterion.c @@ -17,13 +17,15 @@ * Boston, MA 02111-1307, USA. * * Copyright (C) 2011 Ammonit Measurement GmbH + * Copyright (C) 2011 Google Inc. * Author: Aleksander Morgado */ #include #include + #include "mm-plugin-cinterion.h" -#include "mm-modem-cinterion-gsm.h" +#include "mm-broadband-modem-cinterion.h" #include "mm-log.h" G_DEFINE_TYPE (MMPluginCinterion, mm_plugin_cinterion, MM_TYPE_PLUGIN_BASE) @@ -31,186 +33,75 @@ G_DEFINE_TYPE (MMPluginCinterion, mm_plugin_cinterion, 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) +static MMBaseModem * +grab_port (MMPluginBase *base, + MMBaseModem *existing, + MMPortProbe *probe, + GError **error) { - return MM_PLUGIN (g_object_new (MM_TYPE_PLUGIN_CINTERION, - MM_PLUGIN_BASE_NAME, "Cinterion", - MM_PLUGIN_BASE_SORT_LAST, TRUE, - NULL)); -} + MMBaseModem *modem = NULL; + const gchar *name, *subsys, *driver; + guint16 vendor = 0, product = 0; -static guint32 -get_level_for_capabilities (guint32 capabilities) -{ - if (capabilities & MM_PLUGIN_BASE_PORT_CAP_GSM) - return 10; - return 0; -} + subsys = mm_port_probe_get_port_subsys (probe); + name = mm_port_probe_get_port_name (probe); -static gboolean -check_vendor_cinterion (MMPluginBaseSupportsTask *task) -{ - MMPluginBase *base; - GUdevDevice *port; - const char *subsys, *name; - guint16 vendor = 0; + /* /\* The generic plugin cannot do anything with non-AT ports *\/ */ + /* if (!mm_port_probe_is_at (probe)) { */ + /* g_set_error (error, 0, 0, "Ignoring non-AT port"); */ + /* return NULL; */ + /* } */ - base = MM_PLUGIN_BASE (mm_plugin_base_supports_task_get_plugin (task)); - port = mm_plugin_base_supports_task_get_port (task); + driver = mm_port_probe_get_port_driver (probe); - /* Try to get device IDs from udev. Note that it is not an error + /* Try to get Product IDs from udev. Note that it is not an error * if we can't get them in our case, as we also support serial * modems. */ - subsys = g_udev_device_get_subsystem (port); - name = g_udev_device_get_name (port); - mm_plugin_base_get_device_ids (base, subsys, name, &vendor, NULL); - - /* Vendors: Cinterion (0x1e2d) - * Siemens (0x0681) - */ - if (vendor == 0x1e2d || vendor == 0x0681) { - mm_dbg ("Cinterion/Siemens USB modem detected"); - return TRUE; + mm_plugin_base_get_device_ids (base, subsys, name, &vendor, &product); + + /* If this is the first port being grabbed, create a new modem object */ + if (!existing) + modem = MM_BASE_MODEM (mm_broadband_modem_cinterion_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; } - /* We may get Cinterion modems connected in RS232 port, try to get - * probed Vendor ID string to check */ - if (mm_plugin_base_supports_task_propagate_cached (task)) { - const gchar *probed_vendor; - gchar *probed_vendor_strdown; - gboolean probed_vendor_correct = FALSE; - - probed_vendor = mm_plugin_base_supports_task_get_probed_vendor (task); - if (!probed_vendor) - return FALSE; - - /* Lowercase the vendor string and compare */ - probed_vendor_strdown = g_utf8_strdown (probed_vendor, -1); - if (strstr (probed_vendor_strdown, "cinterion") || - strstr (probed_vendor_strdown, "siemens")) { - mm_dbg ("Cinterion/Siemens RS232 modem detected"); - probed_vendor_correct = TRUE; - } - - g_free (probed_vendor_strdown); - - return probed_vendor_correct; - } - - return FALSE; -} - -static void -probe_result (MMPluginBase *base, - MMPluginBaseSupportsTask *task, - guint32 capabilities, - gpointer user_data) -{ - /* Note: the signal contains only capabilities, but we can also query the - * probed vendor and product strings here. */ - - /* Check vendor */ - mm_plugin_base_supports_task_complete (task, - (check_vendor_cinterion (task) ? - get_level_for_capabilities (capabilities) : 0)); + return existing ? existing : modem; } -static MMPluginSupportsResult -supports_port (MMPluginBase *base, - MMModem *existing, - MMPluginBaseSupportsTask *task) -{ - GUdevDevice *port; - guint32 cached = 0; - - /* 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; - - /* First thing to check in this plugin is if we got capabilities already. - * This is because we have a later check of the probed vendor, which is - * taken also during port probing. - * Note that we also relaunch a port probe if we got a cached value but no - * capabilities set (used when trying to detect RS232 modems during - * re-scans). */ - if (!mm_plugin_base_supports_task_propagate_cached (task) || - !mm_plugin_base_supports_task_get_probed_capabilities (task)) { - /* 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; - } - - /* Check vendor */ - if (!check_vendor_cinterion (task)) - return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED; - - /* Completed! */ - cached = mm_plugin_base_supports_task_get_probed_capabilities (task); - mm_plugin_base_supports_task_complete (task, get_level_for_capabilities (cached)); - return MM_PLUGIN_SUPPORTS_PORT_IN_PROGRESS; -} +/*****************************************************************************/ -static MMModem * -grab_port (MMPluginBase *base, - MMModem *existing, - MMPluginBaseSupportsTask *task, - GError **error) +G_MODULE_EXPORT MMPlugin * +mm_plugin_create (void) { - GUdevDevice *port = NULL; - MMModem *modem = NULL; - const char *name, *subsys, *sysfs_path; - guint32 caps; - guint16 vendor = 0x1e2d; - guint16 product = 0; - MMPortType ptype; - - port = mm_plugin_base_supports_task_get_port (task); - g_assert (port); - - /* Try to get Product IDs from udev. Note that it is not an error - * if we can't get them in our case, as we also support serial - * modems. */ - subsys = g_udev_device_get_subsystem (port); - name = g_udev_device_get_name (port); - mm_plugin_base_get_device_ids (base, subsys, name, NULL, &product); - - 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_cinterion_gsm_new (sysfs_path, - mm_plugin_base_supports_task_get_driver (task), - mm_plugin_get_name (MM_PLUGIN (base)), - 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; - } - - return modem; + static const gchar *subsystems[] = { "tty", NULL }; + static const gchar *vendor_strings[] = { "cinterion", "siemens", NULL }; + static const guint16 vendor_ids[] = { 0x1e2d, 0x0681, 0 }; + + return MM_PLUGIN ( + g_object_new (MM_TYPE_PLUGIN_CINTERION, + MM_PLUGIN_BASE_NAME, "Cinterion", + MM_PLUGIN_BASE_ALLOWED_SUBSYSTEMS, subsystems, + MM_PLUGIN_BASE_ALLOWED_VENDOR_STRINGS, vendor_strings, + MM_PLUGIN_BASE_ALLOWED_VENDOR_IDS, vendor_ids, + MM_PLUGIN_BASE_ALLOWED_AT, TRUE, + MM_PLUGIN_BASE_SORT_LAST, TRUE, + NULL)); } -/*****************************************************************************/ - static void mm_plugin_cinterion_init (MMPluginCinterion *self) { - g_signal_connect (self, "probe-result", G_CALLBACK (probe_result), NULL); } static void @@ -218,6 +109,5 @@ mm_plugin_cinterion_class_init (MMPluginCinterionClass *klass) { MMPluginBaseClass *pb_class = MM_PLUGIN_BASE_CLASS (klass); - pb_class->supports_port = supports_port; pb_class->grab_port = grab_port; } -- cgit v1.2.3-70-g09d2