diff options
| -rw-r--r-- | plugins/Makefile.am | 20 | ||||
| -rw-r--r-- | plugins/longcheer/77-mm-longcheer-port-types.rules (renamed from plugins/77-mm-longcheer-port-types.rules) | 0 | ||||
| -rw-r--r-- | plugins/longcheer/mm-plugin-longcheer.c | 277 | ||||
| -rw-r--r-- | plugins/longcheer/mm-plugin-longcheer.h (renamed from plugins/mm-plugin-longcheer.h) | 9 | ||||
| -rw-r--r-- | plugins/mm-plugin-longcheer.c | 259 |
5 files changed, 292 insertions, 273 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index f52ed9f2..b2416216 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -49,7 +49,8 @@ pkglib_LTLIBRARIES = \ libmm-plugin-linktop.la \ libmm-plugin-simtech.la \ libmm-plugin-wavecom.la \ - libmm-plugin-huawei.la + libmm-plugin-huawei.la \ + libmm-plugin-longcheer.la #pkglib_LTLIBRARIES = \ # libmm-plugin-generic.la \ @@ -188,15 +189,14 @@ udevrules_DATA += nokia/77-mm-nokia-port-types.rules #libmm_plugin_zte_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) #libmm_plugin_zte_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) #libmm_plugin_zte_la_LIBADD = $(builddir)/libicera-utils.la -# -## Longcheer (and rebranded dongles) -#libmm_plugin_longcheer_la_SOURCES = \ -# mm-plugin-longcheer.c \ -# mm-plugin-longcheer.h \ -# mm-modem-longcheer-gsm.c \ -# mm-modem-longcheer-gsm.h -#libmm_plugin_longcheer_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) -#libmm_plugin_longcheer_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) + +# Longcheer (and rebranded dongles) +libmm_plugin_longcheer_la_SOURCES = \ + longcheer/mm-plugin-longcheer.c \ + longcheer/mm-plugin-longcheer.h +libmm_plugin_longcheer_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) +libmm_plugin_longcheer_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) +udevrules_DATA += longcheer/77-mm-longcheer-port-types.rules # AnyData CDMA libmm_plugin_anydata_la_SOURCES = \ diff --git a/plugins/77-mm-longcheer-port-types.rules b/plugins/longcheer/77-mm-longcheer-port-types.rules index ce0134b3..ce0134b3 100644 --- a/plugins/77-mm-longcheer-port-types.rules +++ b/plugins/longcheer/77-mm-longcheer-port-types.rules diff --git a/plugins/longcheer/mm-plugin-longcheer.c b/plugins/longcheer/mm-plugin-longcheer.c new file mode 100644 index 00000000..f392cb76 --- /dev/null +++ b/plugins/longcheer/mm-plugin-longcheer.c @@ -0,0 +1,277 @@ +/* -*- 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-log.h" +#include "mm-modem-helpers.h" +#include "mm-plugin-longcheer.h" +#include "mm-broadband-modem.h" + +G_DEFINE_TYPE (MMPluginLongcheer, mm_plugin_longcheer, MM_TYPE_PLUGIN) + +int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION; +int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION; + +/*****************************************************************************/ +/* Custom init */ + +typedef struct { + MMPortProbe *probe; + MMAtSerialPort *port; + GCancellable *cancellable; + GSimpleAsyncResult *result; + guint retries; +} LongcheerCustomInitContext; + +static void +longcheer_custom_init_context_complete_and_free (LongcheerCustomInitContext *ctx) +{ + g_simple_async_result_complete_in_idle (ctx->result); + + if (ctx->cancellable) + g_object_unref (ctx->cancellable); + g_object_unref (ctx->port); + g_object_unref (ctx->probe); + g_object_unref (ctx->result); + g_slice_free (LongcheerCustomInitContext, ctx); +} + +static gboolean +longcheer_custom_init_finish (MMPortProbe *probe, + GAsyncResult *result, + GError **error) +{ + return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error); +} + +static void longcheer_custom_init_step (LongcheerCustomInitContext *ctx); + +static void +gmr_ready (MMAtSerialPort *port, + GString *response, + GError *error, + LongcheerCustomInitContext *ctx) +{ + const gchar *p; + + if (error) { + /* Just retry... */ + longcheer_custom_init_step (ctx); + return; + } + + /* Note the lack of a ':' on the GMR; the X200 doesn't send one */ + p = mm_strip_tag (response->str, "AT+GMR"); + if (p && *p == 'L') { + /* X200 modems have a GMR firmware revision that starts with 'L', and + * as far as I can tell X060s devices have a revision starting with 'C'. + * So use that to determine if the device is an X200, which this plugin + * does not support since it uses a different chipset even though the + * X060s and the X200 have the exact same USB VID and PID. + */ + g_simple_async_result_set_error (ctx->result, + MM_CORE_ERROR, + MM_CORE_ERROR_UNSUPPORTED, + "X200 cannot be supported with the Longcheer plugin"); + } else { + mm_dbg ("(Longcheer) device is not a X200"); + g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); + } + + longcheer_custom_init_context_complete_and_free (ctx); +} + +static void +longcheer_custom_init_step (LongcheerCustomInitContext *ctx) +{ + /* If cancelled, end */ + if (g_cancellable_is_cancelled (ctx->cancellable)) { + mm_dbg ("(Longcheer) no need to keep on running custom init in (%s)", + mm_port_get_device (MM_PORT (ctx->port))); + g_simple_async_result_set_error (ctx->result, + MM_CORE_ERROR, + MM_CORE_ERROR_CANCELLED, + "Custom initialization cancelled"); + longcheer_custom_init_context_complete_and_free (ctx); + return; + } + + if (ctx->retries == 0) { + /* In this case, we need the AT command result to decide whether we can + * support this modem or not, so really fail if we didn't get it. */ + g_simple_async_result_set_error (ctx->result, + MM_CORE_ERROR, + MM_CORE_ERROR_FAILED, + "Couldn't get device revision information"); + longcheer_custom_init_context_complete_and_free (ctx); + return; + } + + ctx->retries--; + mm_at_serial_port_queue_command ( + ctx->port, + "AT+GMR", + 3, + ctx->cancellable, + (MMAtSerialResponseFn)gmr_ready, + ctx); +} + +static void +longcheer_custom_init (MMPortProbe *probe, + MMAtSerialPort *port, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + MMDevice *device; + LongcheerCustomInitContext *ctx; + + ctx = g_slice_new (LongcheerCustomInitContext); + ctx->result = g_simple_async_result_new (G_OBJECT (probe), + callback, + user_data, + longcheer_custom_init); + ctx->probe = g_object_ref (probe); + ctx->port = g_object_ref (port); + ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL; + ctx->retries = 3; + + /* TCT/Alcatel in their infinite wisdom assigned the same USB VID/PID to + * the x060s (Longcheer firmware) and the x200 (something else) and thus + * we can't tell them apart via udev rules. Worse, they both report the + * same +GMM and +GMI, so we're left with just +GMR which is a sketchy way + * to tell modems apart. We can't really use Longcheer-specific commands + * like AT+MODODR or AT+PSRAT because we're not sure if they work when the + * SIM PIN has not been entered yet; many modems have a limited command + * parser before the SIM is unlocked. + */ + device = mm_port_probe_peek_device (probe); + if (mm_device_get_vendor (device) != 0x1bbb || + mm_device_get_product (device) != 0x0000) { + /* If not exactly this vendor/product, just skip */ + g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); + longcheer_custom_init_context_complete_and_free (ctx); + return; + } + + longcheer_custom_init_step (ctx); +} + +/*****************************************************************************/ + +static MMBaseModem * +create_modem (MMPlugin *self, + const gchar *sysfs_path, + const gchar *driver, + guint16 vendor, + guint16 product, + GList *probes, + GError **error) +{ + return MM_BASE_MODEM (mm_broadband_modem_new (sysfs_path, + driver, + mm_plugin_get_name (self), + vendor, + product)); +} + +static gboolean +grab_port (MMPlugin *self, + MMBaseModem *modem, + MMPortProbe *probe, + GError **error) +{ + GUdevDevice *port; + MMPortType ptype; + MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE; + + port = mm_port_probe_peek_port (probe); + ptype = mm_port_probe_get_port_type (probe); + + /* 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_LONGCHEER_PORT_TYPE_MODEM")) + pflags = MM_AT_PORT_FLAG_PRIMARY; + else if (g_udev_device_get_property_as_boolean (port, "ID_MM_LONGCHEER_PORT_TYPE_AUX")) + pflags = MM_AT_PORT_FLAG_SECONDARY; + else { + /* 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. + */ + ptype = MM_PORT_TYPE_IGNORED; + } + + return mm_base_modem_grab_port (modem, + mm_port_probe_get_port_subsys (probe), + mm_port_probe_get_port_name (probe), + ptype, + pflags, + error); +} + +/*****************************************************************************/ + +G_MODULE_EXPORT MMPlugin * +mm_plugin_create (void) +{ + static const gchar *subsystems[] = { "tty", NULL }; + /* Vendors: Longcheer and TAMobile */ + static const guint16 vendor_ids[] = { 0x1c9e, 0x1bbb, 0 }; + /* Some TAMobile devices are different chipsets and should be handled + * by other plugins, so only handle LONGCHEER tagged devices here. + */ + static const gchar *udev_tags[] = { + "ID_MM_LONGCHEER_TAGGED", + NULL + }; + static const MMAsyncMethod custom_init = { + .async = G_CALLBACK (longcheer_custom_init), + .finish = G_CALLBACK (longcheer_custom_init_finish), + }; + + return MM_PLUGIN ( + g_object_new (MM_TYPE_PLUGIN_LONGCHEER, + MM_PLUGIN_NAME, "Longcheer", + MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems, + MM_PLUGIN_ALLOWED_VENDOR_IDS, vendor_ids, + MM_PLUGIN_ALLOWED_AT, TRUE, + MM_PLUGIN_ALLOWED_UDEV_TAGS, udev_tags, + MM_PLUGIN_CUSTOM_INIT, &custom_init, + NULL)); +} + +static void +mm_plugin_longcheer_init (MMPluginLongcheer *self) +{ +} + +static void +mm_plugin_longcheer_class_init (MMPluginLongcheerClass *klass) +{ + MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass); + + plugin_class->create_modem = create_modem; + plugin_class->grab_port = grab_port; +} diff --git a/plugins/mm-plugin-longcheer.h b/plugins/longcheer/mm-plugin-longcheer.h index 387a2900..1a5f2b98 100644 --- a/plugins/mm-plugin-longcheer.h +++ b/plugins/longcheer/mm-plugin-longcheer.h @@ -11,13 +11,14 @@ * GNU General Public License for more details: * * Copyright (C) 2008 - 2009 Novell, Inc. - * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2009 - 2012 Red Hat, Inc. + * Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org> */ #ifndef MM_PLUGIN_LONGCHEER_H #define MM_PLUGIN_LONGCHEER_H -#include "mm-plugin-base.h" +#include "mm-plugin.h" #define MM_TYPE_PLUGIN_LONGCHEER (mm_plugin_longcheer_get_type ()) #define MM_PLUGIN_LONGCHEER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_LONGCHEER, MMPluginLongcheer)) @@ -27,11 +28,11 @@ #define MM_PLUGIN_LONGCHEER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_PLUGIN_LONGCHEER, MMPluginLongcheerClass)) typedef struct { - MMPluginBase parent; + MMPlugin parent; } MMPluginLongcheer; typedef struct { - MMPluginBaseClass parent; + MMPluginClass parent; } MMPluginLongcheerClass; GType mm_plugin_longcheer_get_type (void); diff --git a/plugins/mm-plugin-longcheer.c b/plugins/mm-plugin-longcheer.c deleted file mode 100644 index 5a93d468..00000000 --- a/plugins/mm-plugin-longcheer.c +++ /dev/null @@ -1,259 +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-longcheer.h" -#include "mm-modem-longcheer-gsm.h" -#include "mm-generic-gsm.h" -#include "mm-generic-cdma.h" -#include "mm-modem-helpers.h" - -G_DEFINE_TYPE (MMPluginLongcheer, mm_plugin_longcheer, 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_LONGCHEER, - MM_PLUGIN_BASE_NAME, "Longcheer", - 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 gboolean -custom_init_response_cb (MMPluginBaseSupportsTask *task, - GString *response, - GError *error, - guint32 tries, - gboolean *out_stop, - guint32 *out_level, - gpointer user_data) -{ - const char *p; - - if (error) - return tries <= 4 ? TRUE : FALSE; - - /* Note the lack of a ':' on the GMR; the X200 doesn't send one */ - g_assert (response); - p = mm_strip_tag (response->str, "AT+GMR"); - if (*p == 'L') { - /* X200 modems have a GMR firmware revision that starts with 'L', and - * as far as I can tell X060s devices have a revision starting with 'C'. - * So use that to determine if the device is an X200, which this plugin - * does not support since it uses a different chipset even though the - * X060s and the X200 have the exact same USB VID and PID. - */ - *out_level = 0; - *out_stop = TRUE; - return FALSE; - } - - /* Continue with generic probing */ - return FALSE; -} - -static MMPluginSupportsResult -supports_port (MMPluginBase *base, - MMModem *existing, - MMPluginBaseSupportsTask *task) -{ - GUdevDevice *port; - guint16 vendor = 0, product = 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, &product)) - return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED; - - /* Longcheer and TAMobile */ - if (vendor != 0x1c9e && vendor != 0x1bbb) - return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED; - - /* Some TAMobile devices are different chipsets and should be handled - * by other plugins, so only handle LONGCHEER tagged devices here. - */ - if (g_udev_device_get_property_as_boolean (port, "ID_MM_LONGCHEER_TAGGED") == FALSE) - 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; - } - - /* TCT/Alcatel in their infinite wisdom assigned the same USB VID/PID to - * the x060s (Longcheer firmware) and the x200 (something else) and thus - * we can't tell them apart via udev rules. Worse, they both report the - * same +GMM and +GMI, so we're left with just +GMR which is a sketchy way - * to tell modems apart. We can't really use Longcheer-specific commands - * like AT+MODODR or AT+PSRAT because we're not sure if they work when the - * SIM PIN has not been entered yet; many modems have a limited command - * parser before the SIM is unlocked. - */ - if (vendor == 0x1bbb && product == 0x0000) { - mm_plugin_base_supports_task_add_custom_init_command (task, - "AT+GMR", - 3, - custom_init_response_cb, - NULL); - } - - /* 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; - MMAtPortFlags pflags = MM_AT_PORT_FLAG_NONE; - guint16 vendor = 0, product = 0; - - 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_LONGCHEER_PORT_TYPE_MODEM")) - pflags = MM_AT_PORT_FLAG_PRIMARY; - else if (g_udev_device_get_property_as_boolean (port, "ID_MM_LONGCHEER_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_LONGCHEER_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_longcheer_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_longcheer_init (MMPluginLongcheer *self) -{ - g_signal_connect (self, "probe-result", G_CALLBACK (probe_result), NULL); -} - -static void -mm_plugin_longcheer_class_init (MMPluginLongcheerClass *klass) -{ - MMPluginBaseClass *pb_class = MM_PLUGIN_BASE_CLASS (klass); - - pb_class->supports_port = supports_port; - pb_class->grab_port = grab_port; -} |