diff options
| -rw-r--r-- | plugins/77-mm-x22x-port-types.rules | 30 | ||||
| -rw-r--r-- | plugins/Makefile.am | 24 | ||||
| -rw-r--r-- | plugins/mm-modem-x22x-gsm.c | 205 | ||||
| -rw-r--r-- | plugins/mm-modem-x22x-gsm.h | 43 | ||||
| -rw-r--r-- | plugins/mm-plugin-x22x.c | 184 | ||||
| -rw-r--r-- | plugins/mm-plugin-x22x.h | 41 |
6 files changed, 525 insertions, 2 deletions
diff --git a/plugins/77-mm-x22x-port-types.rules b/plugins/77-mm-x22x-port-types.rules new file mode 100644 index 00000000..0f870a44 --- /dev/null +++ b/plugins/77-mm-x22x-port-types.rules @@ -0,0 +1,30 @@ +# do not edit this file, it will be overwritten on update + +# Alcatel One Touch X220D +# +# These values were scraped from the X220D's Windows .inf files. jrdmdm.inf +# lists the actual command and data (ie PPP) ports, while jrdser.inf lists the +# aux ports that may be either AT-capable or not but cannot be used for PPP. + + +ACTION!="add|change", GOTO="mm_x22x_port_types_end" +SUBSYSTEM!="tty", GOTO="mm_x22x_port_types_end" + +SUBSYSTEMS=="usb", ATTRS{idVendor}=="1bbb", GOTO="mm_x22x_vendorcheck" +GOTO="mm_x22x_port_types_end" + +LABEL="mm_x22x_vendorcheck" +SUBSYSTEMS=="usb", ATTRS{bInterfaceNumber}=="?*", ENV{.MM_USBIFNUM}="$attr{bInterfaceNumber}" + +ATTRS{idProduct}=="0017", ENV{.MM_USBIFNUM}=="05", ENV{ID_MM_X22X_PORT_TYPE_MODEM}="1" +ATTRS{idProduct}=="0017", ENV{.MM_USBIFNUM}=="00", ENV{ID_MM_X22X_PORT_TYPE_AUX}="1" +ATTRS{idProduct}=="0017", ENV{.MM_USBIFNUM}=="01", ENV{ID_MM_X22X_PORT_TYPE_AUX}="1" +ATTRS{idProduct}=="0017", ENV{.MM_USBIFNUM}=="02", ENV{ID_MM_X22X_PORT_TYPE_AUX}="1" +ATTRS{idProduct}=="0017", ENV{.MM_USBIFNUM}=="03", ENV{ID_MM_X22X_PORT_TYPE_AUX}="1" +ATTRS{idProduct}=="0017", ENV{ID_MM_X22X_TAGGED}="1" + +GOTO="mm_x22x_port_types_end" + + +LABEL="mm_x22x_port_types_end" + diff --git a/plugins/Makefile.am b/plugins/Makefile.am index bc77a266..60c84b13 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -12,7 +12,8 @@ pkglib_LTLIBRARIES = \ libmm-plugin-mbm.la \ libmm-plugin-longcheer.la \ libmm-plugin-anydata.la \ - libmm-plugin-simtech.la + libmm-plugin-simtech.la \ + libmm-plugin-x22x.la # Generic @@ -275,13 +276,32 @@ libmm_plugin_simtech_la_LDFLAGS = \ -module \ -avoid-version +# Alcatel/TCT/JRD x220D and possibly others + +libmm_plugin_x22x_la_SOURCES = \ + mm-plugin-x22x.c \ + mm-plugin-x22x.h \ + mm-modem-x22x-gsm.c \ + mm-modem-x22x-gsm.h + +libmm_plugin_x22x_la_CPPFLAGS = \ + $(MM_CFLAGS) \ + $(GUDEV_CFLAGS) \ + -I$(top_srcdir)/src + +libmm_plugin_x22x_la_LDFLAGS = \ + $(GUDEV_LDFLAGS) \ + -module \ + -avoid-version + udevrulesdir = $(UDEV_BASE_DIR)/rules.d udevrules_DATA = \ 77-mm-ericsson-mbm.rules \ 77-mm-zte-port-types.rules \ 77-mm-longcheer-port-types.rules \ - 77-mm-simtech-port-types.rules + 77-mm-simtech-port-types.rules \ + 77-mm-x22x-port-types.rules BUILT_SOURCES = \ mm-modem-gsm-hso-glue.h diff --git a/plugins/mm-modem-x22x-gsm.c b/plugins/mm-modem-x22x-gsm.c new file mode 100644 index 00000000..8356b49d --- /dev/null +++ b/plugins/mm-modem-x22x-gsm.c @@ -0,0 +1,205 @@ +/* -*- 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 <config.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> +#include <ctype.h> +#include "mm-modem-x22x-gsm.h" +#include "mm-at-serial-port.h" +#include "mm-errors.h" +#include "mm-callback-info.h" +#include "mm-modem-helpers.h" + +G_DEFINE_TYPE (MMModemX22xGsm, mm_modem_x22x_gsm, MM_TYPE_GENERIC_GSM) + +MMModem * +mm_modem_x22x_gsm_new (const char *device, + const char *driver, + const char *plugin) +{ + g_return_val_if_fail (device != NULL, NULL); + g_return_val_if_fail (driver != NULL, NULL); + g_return_val_if_fail (plugin != NULL, NULL); + + return MM_MODEM (g_object_new (MM_TYPE_MODEM_X22X_GSM, + MM_MODEM_MASTER_DEVICE, device, + MM_MODEM_DRIVER, driver, + MM_MODEM_PLUGIN, plugin, + NULL)); +} + +/*****************************************************************************/ + +static gboolean +parse_syssel_response (GString *response, + MMModemGsmAllowedMode *out_mode, + GError **error) +{ + GRegex *r; + GMatchInfo *match_info; + char *str; + gint mode = -1; + gboolean success = FALSE; + + g_return_val_if_fail (response != NULL, FALSE); + g_return_val_if_fail (out_mode != NULL, FALSE); + + r = g_regex_new ("\\+SYSSEL:\\s*(\\d),(\\d),(\\d),(\\d)", G_REGEX_UNGREEDY, 0, NULL); + if (!r) { + g_set_error_literal (error, MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, + "Internal error parsing mode/tech response"); + return FALSE; + } + + if (!g_regex_match_full (r, response->str, response->len, 0, 0, &match_info, NULL)) { + g_set_error_literal (error, MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, + "Failed to parse mode/tech response"); + goto out; + } + + str = g_match_info_fetch (match_info, 3); + mode = atoi (str); + g_free (str); + + g_match_info_free (match_info); + + if (mode < 0 || mode > 2) { + g_set_error_literal (error, MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, + "Failed to parse mode/tech response"); + goto out; + } + + if (out_mode) { + if (mode == 0) + *out_mode = MM_MODEM_GSM_ALLOWED_MODE_ANY; + else if (mode == 1) + *out_mode = MM_MODEM_GSM_ALLOWED_MODE_2G_ONLY; + else if (mode == 2) + *out_mode = MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY; + else + *out_mode = MM_MODEM_GSM_ALLOWED_MODE_ANY; + } + success = TRUE; + +out: + g_regex_unref (r); + return success; +} + +static void +get_allowed_mode_done (MMAtSerialPort *port, + GString *response, + GError *error, + gpointer user_data) +{ + MMCallbackInfo *info = (MMCallbackInfo *) user_data; + MMModemGsmAllowedMode mode = MM_MODEM_GSM_ALLOWED_MODE_ANY; + + info->error = mm_modem_check_removed (info->modem, error); + if (!info->error) { + parse_syssel_response (response, &mode, &info->error); + mm_callback_info_set_result (info, GUINT_TO_POINTER (mode), NULL); + } + + mm_callback_info_schedule (info); +} + +static void +get_allowed_mode (MMGenericGsm *gsm, + MMModemUIntFn callback, + gpointer user_data) +{ + MMCallbackInfo *info; + MMAtSerialPort *port; + + info = mm_callback_info_uint_new (MM_MODEM (gsm), callback, user_data); + + port = mm_generic_gsm_get_best_at_port (gsm, &info->error); + if (!port) { + mm_callback_info_schedule (info); + return; + } + + mm_at_serial_port_queue_command (port, "+SYSSEL?", 3, get_allowed_mode_done, info); +} + +static void +set_allowed_mode_done (MMAtSerialPort *port, + GString *response, + GError *error, + gpointer user_data) +{ + MMCallbackInfo *info = (MMCallbackInfo *) user_data; + + info->error = mm_modem_check_removed (info->modem, error); + mm_callback_info_schedule (info); +} + +static void +set_allowed_mode (MMGenericGsm *gsm, + MMModemGsmAllowedMode mode, + MMModemFn callback, + gpointer user_data) +{ + MMCallbackInfo *info; + MMAtSerialPort *port; + char *command = NULL; + + info = mm_callback_info_new (MM_MODEM (gsm), callback, user_data); + + port = mm_generic_gsm_get_best_at_port (gsm, &info->error); + if (!port) { + mm_callback_info_schedule (info); + return; + } + + switch (mode) { + case MM_MODEM_GSM_ALLOWED_MODE_2G_ONLY: + command = "+SYSSEL=,1,0"; + break; + case MM_MODEM_GSM_ALLOWED_MODE_3G_ONLY: + command = "+SYSSEL=,2,0"; + break; + case MM_MODEM_GSM_ALLOWED_MODE_ANY: + default: + command = "+SYSSEL=,0,0"; + break; + } + + mm_at_serial_port_queue_command (port, command, 3, set_allowed_mode_done, info); +} + +/*****************************************************************************/ + +static void +mm_modem_x22x_gsm_init (MMModemX22xGsm *self) +{ +} + +static void +mm_modem_x22x_gsm_class_init (MMModemX22xGsmClass *klass) +{ + MMGenericGsmClass *gsm_class = MM_GENERIC_GSM_CLASS (klass); + + mm_modem_x22x_gsm_parent_class = g_type_class_peek_parent (klass); + + gsm_class->set_allowed_mode = set_allowed_mode; + gsm_class->get_allowed_mode = get_allowed_mode; +} + diff --git a/plugins/mm-modem-x22x-gsm.h b/plugins/mm-modem-x22x-gsm.h new file mode 100644 index 00000000..8922afbf --- /dev/null +++ b/plugins/mm-modem-x22x-gsm.h @@ -0,0 +1,43 @@ +/* -*- 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. + */ + +#ifndef MM_MODEM_X22X_GSM_H +#define MM_MODEM_X22X_GSM_H + +#include "mm-generic-gsm.h" + +#define MM_TYPE_MODEM_X22X_GSM (mm_modem_x22x_gsm_get_type ()) +#define MM_MODEM_X22X_GSM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_MODEM_X22X_GSM, MMModemX22xGsm)) +#define MM_MODEM_X22X_GSM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_MODEM_X22X_GSM, MMModemX22xGsmClass)) +#define MM_IS_MODEM_X22X_GSM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_MODEM_X22X_GSM)) +#define MM_IS_MODEM_X22X_GSM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_MODEM_X22X_GSM)) +#define MM_MODEM_X22X_GSM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_MODEM_X22X_GSM, MMModemX22xGsmClass)) + +typedef struct { + MMGenericGsm parent; +} MMModemX22xGsm; + +typedef struct { + MMGenericGsmClass parent; +} MMModemX22xGsmClass; + +GType mm_modem_x22x_gsm_get_type (void); + +MMModem *mm_modem_x22x_gsm_new (const char *device, + const char *driver, + const char *plugin); + +#endif /* MM_MODEM_X22X_H */ diff --git a/plugins/mm-plugin-x22x.c b/plugins/mm-plugin-x22x.c new file mode 100644 index 00000000..ecad48ed --- /dev/null +++ b/plugins/mm-plugin-x22x.c @@ -0,0 +1,184 @@ +/* -*- 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-x22x.h" +#include "mm-modem-x22x-gsm.h" +#include "mm-generic-gsm.h" + +G_DEFINE_TYPE (MMPluginX22x, mm_plugin_x22x, 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_X22X, + MM_PLUGIN_BASE_NAME, "X22X", + NULL)); +} + +/*****************************************************************************/ + +static guint32 +get_level_for_capabilities (guint32 capabilities) +{ + /* These modems have the same vendor ID as a few of the other + * Alcatel/TCT/T&A modems, and the longcheer plugin will try to claim them + * too. So we provide a higher support level here to make sure this + * plugin tries to grab it's supported devices first. + */ + if (capabilities & MM_PLUGIN_BASE_PORT_CAP_GSM) + return 20; + if (capabilities & MM_PLUGIN_BASE_PORT_CAP_QCDM) + return 20; + 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; + guint32 cached = 0, level; + 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; + + /* Only TCT/T&A for now */ + if (vendor != 0x1bbb) + return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED; + + /* If the port wasn't tagged, we don't support it */ + if (!g_udev_device_get_property_as_boolean (port, "ID_MM_X22X_TAGGED")) + return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED; + + if (mm_plugin_base_get_cached_port_capabilities (base, port, &cached)) { + level = get_level_for_capabilities (cached); + 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, 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 = MM_PORT_TYPE_UNKNOWN; + + 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_X22X_PORT_TYPE_MODEM")) + ptype = MM_PORT_TYPE_PRIMARY; + else if (g_udev_device_get_property_as_boolean (port, "ID_MM_X22X_PORT_TYPE_AUX")) + ptype = MM_PORT_TYPE_SECONDARY; + + /* If the device was tagged by the udev rules, then ignore any other ports + * to guard against race conditions if a device just happens to show up + * with more than two AT-capable ports. + */ + if ( (ptype == MM_PORT_TYPE_UNKNOWN) + && g_udev_device_get_property_as_boolean (port, "ID_MM_X22X_TAGGED")) + ptype = MM_PORT_TYPE_IGNORED; + + subsys = g_udev_device_get_subsystem (port); + name = g_udev_device_get_name (port); + + caps = mm_plugin_base_supports_task_get_probed_capabilities (task); + sysfs_path = mm_plugin_base_supports_task_get_physdev_path (task); + if (!existing) { + if (caps & MM_PLUGIN_BASE_PORT_CAP_GSM) { + modem = mm_modem_x22x_gsm_new (sysfs_path, + mm_plugin_base_supports_task_get_driver (task), + mm_plugin_get_name (MM_PLUGIN (base))); + } + + if (modem) { + if (!mm_modem_grab_port (modem, subsys, name, ptype, NULL, error)) { + g_object_unref (modem); + return NULL; + } + } + } else if (get_level_for_capabilities (caps)) { + if (caps & MM_PLUGIN_BASE_PORT_CAP_QCDM) + ptype = MM_PORT_TYPE_QCDM; + + modem = existing; + if (!mm_modem_grab_port (modem, subsys, name, ptype, NULL, error)) + return NULL; + } + + return modem; +} + +/*****************************************************************************/ + +static void +mm_plugin_x22x_init (MMPluginX22x *self) +{ + g_signal_connect (self, "probe-result", G_CALLBACK (probe_result), NULL); +} + +static void +mm_plugin_x22x_class_init (MMPluginX22xClass *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-x22x.h b/plugins/mm-plugin-x22x.h new file mode 100644 index 00000000..227511d8 --- /dev/null +++ b/plugins/mm-plugin-x22x.h @@ -0,0 +1,41 @@ +/* -*- 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. + */ + +#ifndef MM_PLUGIN_X22X_H +#define MM_PLUGIN_X22X_H + +#include "mm-plugin-base.h" + +#define MM_TYPE_PLUGIN_X22X (mm_plugin_x22x_get_type ()) +#define MM_PLUGIN_X22X(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_X22X, MMPluginX22x)) +#define MM_PLUGIN_X22X_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_PLUGIN_X22X, MMPluginX22xClass)) +#define MM_IS_PLUGIN_X22X(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_X22X)) +#define MM_IS_PLUGIN_X22X_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_PLUGIN_X22X)) +#define MM_PLUGIN_X22X_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_PLUGIN_X22X, MMPluginX22xClass)) + +typedef struct { + MMPluginBase parent; +} MMPluginX22x; + +typedef struct { + MMPluginBaseClass parent; +} MMPluginX22xClass; + +GType mm_plugin_x22x_get_type (void); + +G_MODULE_EXPORT MMPlugin *mm_plugin_create (void); + +#endif /* MM_PLUGIN_X22X_H */ |