diff options
| -rw-r--r-- | plugins/Makefile.am | 23 | ||||
| -rw-r--r-- | plugins/option/mm-broadband-modem-option.c | 70 | ||||
| -rw-r--r-- | plugins/option/mm-broadband-modem-option.h | 49 | ||||
| -rw-r--r-- | plugins/option/mm-plugin-option.c | 133 | ||||
| -rw-r--r-- | plugins/option/mm-plugin-option.h (renamed from plugins/mm-plugin-option.h) | 3 |
5 files changed, 266 insertions, 12 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index c0ecc56e..8303e2f4 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -37,7 +37,8 @@ pkglib_LTLIBRARIES = \ libmm-plugin-iridium.la \ libmm-plugin-nokia.la \ libmm-plugin-gobi.la \ - libmm-plugin-motorola.la + libmm-plugin-motorola.la \ + libmm-plugin-option.la #pkglib_LTLIBRARIES = \ # libmm-plugin-generic.la \ @@ -117,16 +118,16 @@ libmm_plugin_gobi_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) # mm-modem-mbm.h #libmm_plugin_mbm_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) #libmm_plugin_mbm_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) -# -## Option -#libmm_plugin_option_la_SOURCES = \ -# mm-plugin-option.c \ -# mm-plugin-option.h \ -# mm-modem-option.c \ -# mm-modem-option.h -#libmm_plugin_option_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) -#libmm_plugin_option_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) -# + +# Option +libmm_plugin_option_la_SOURCES = \ + option/mm-plugin-option.c \ + option/mm-plugin-option.h \ + option/mm-broadband-modem-option.c \ + option/mm-broadband-modem-option.h +libmm_plugin_option_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) +libmm_plugin_option_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) + ## Sierra #libmm_plugin_sierra_la_SOURCES = \ # mm-plugin-sierra.c \ diff --git a/plugins/option/mm-broadband-modem-option.c b/plugins/option/mm-broadband-modem-option.c new file mode 100644 index 00000000..a371f060 --- /dev/null +++ b/plugins/option/mm-broadband-modem-option.c @@ -0,0 +1,70 @@ +/* -*- 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 <config.h> + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> +#include <ctype.h> + +#include "ModemManager.h" +#include "mm-serial-parsers.h" +#include "mm-log.h" +#include "mm-errors-types.h" +#include "mm-iface-modem.h" +#include "mm-base-modem-at.h" +#include "mm-broadband-modem-option.h" + +static void iface_modem_init (MMIfaceModem *iface); + +G_DEFINE_TYPE_EXTENDED (MMBroadbandModemOption, mm_broadband_modem_option, MM_TYPE_BROADBAND_MODEM, 0, + G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)); + +/*****************************************************************************/ + +MMBroadbandModemOption * +mm_broadband_modem_option_new (const gchar *device, + const gchar *driver, + const gchar *plugin, + guint16 vendor_id, + guint16 product_id) +{ + return g_object_new (MM_TYPE_BROADBAND_MODEM_OPTION, + 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_option_init (MMBroadbandModemOption *self) +{ +} + +static void +iface_modem_init (MMIfaceModem *iface) +{ +} + +static void +mm_broadband_modem_option_class_init (MMBroadbandModemOptionClass *klass) +{ +} diff --git a/plugins/option/mm-broadband-modem-option.h b/plugins/option/mm-broadband-modem-option.h new file mode 100644 index 00000000..ed32d3c1 --- /dev/null +++ b/plugins/option/mm-broadband-modem-option.h @@ -0,0 +1,49 @@ +/* -*- 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> + */ + +#ifndef MM_BROADBAND_MODEM_OPTION_H +#define MM_BROADBAND_MODEM_OPTION_H + +#include "mm-broadband-modem.h" + +#define MM_TYPE_BROADBAND_MODEM_OPTION (mm_broadband_modem_option_get_type ()) +#define MM_BROADBAND_MODEM_OPTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_MODEM_OPTION, MMBroadbandModemOption)) +#define MM_BROADBAND_MODEM_OPTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BROADBAND_MODEM_OPTION, MMBroadbandModemOptionClass)) +#define MM_IS_BROADBAND_MODEM_OPTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_MODEM_OPTION)) +#define MM_IS_BROADBAND_MODEM_OPTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_MODEM_OPTION)) +#define MM_BROADBAND_MODEM_OPTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BROADBAND_MODEM_OPTION, MMBroadbandModemOptionClass)) + +typedef struct _MMBroadbandModemOption MMBroadbandModemOption; +typedef struct _MMBroadbandModemOptionClass MMBroadbandModemOptionClass; + +struct _MMBroadbandModemOption { + MMBroadbandModem parent; +}; + +struct _MMBroadbandModemOptionClass{ + MMBroadbandModemClass parent; +}; + +GType mm_broadband_modem_option_get_type (void); + +MMBroadbandModemOption *mm_broadband_modem_option_new (const gchar *device, + const gchar *driver, + const gchar *plugin, + guint16 vendor_id, + guint16 product_id); + +#endif /* MM_BROADBAND_MODEM_OPTION_H */ diff --git a/plugins/option/mm-plugin-option.c b/plugins/option/mm-plugin-option.c new file mode 100644 index 00000000..4b0561fd --- /dev/null +++ b/plugins/option/mm-plugin-option.c @@ -0,0 +1,133 @@ +/* -*- 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 <mm-errors-types.h> + +#include "mm-private-boxed-types.h" +#include "mm-plugin-option.h" +#include "mm-broadband-modem-option.h" + +G_DEFINE_TYPE (MMPluginOption, mm_plugin_option, 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, *driver; + guint16 vendor = 0, product = 0; + MMAtPortFlag pflags = MM_AT_PORT_FLAG_NONE; + gint usbif; + + /* The Option plugin cannot do anything with non-AT ports */ + if (!mm_port_probe_is_at (probe)) { + g_set_error_literal (error, + MM_CORE_ERROR, + MM_CORE_ERROR_UNSUPPORTED, + "Ignoring non-AT 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); + driver = mm_port_probe_get_port_driver (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; + } + + /* Genuine Option NV devices are always supposed to use USB interface 0 as + * the modem/data port, per mail with Option engineers. Only this port + * will emit responses to dialing commands. + */ + usbif = g_udev_device_get_property_as_int (port, "ID_USB_INTERFACE_NUM"); + if (usbif == 0) + pflags = MM_AT_PORT_FLAG_PRIMARY | MM_AT_PORT_FLAG_PPP; + + /* If this is the first port being grabbed, create a new modem object */ + if (!existing) + modem = MM_BASE_MODEM (mm_broadband_modem_option_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_AT, /* we only allow AT ports here */ + 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[] = { 0x0af0, 0 }; /* Option USB devices */ + static const mm_uint16_pair product_ids[] = { { 0x1931, 0x000c }, /* Nozomi CardBus devices */ + { 0, 0 } + }; + static const gchar *drivers[] = { "option1", "option", "nozomi", NULL }; + + return MM_PLUGIN ( + g_object_new (MM_TYPE_PLUGIN_OPTION, + MM_PLUGIN_BASE_NAME, "Option", + MM_PLUGIN_BASE_ALLOWED_SUBSYSTEMS, subsystems, + MM_PLUGIN_BASE_ALLOWED_DRIVERS, drivers, + MM_PLUGIN_BASE_ALLOWED_VENDOR_IDS, vendor_ids, + MM_PLUGIN_BASE_ALLOWED_PRODUCT_IDS, product_ids, + MM_PLUGIN_BASE_ALLOWED_AT, TRUE, + NULL)); +} + +static void +mm_plugin_option_init (MMPluginOption *self) +{ +} + +static void +mm_plugin_option_class_init (MMPluginOptionClass *klass) +{ + MMPluginBaseClass *pb_class = MM_PLUGIN_BASE_CLASS (klass); + + pb_class->grab_port = grab_port; +} diff --git a/plugins/mm-plugin-option.h b/plugins/option/mm-plugin-option.h index dfcff749..3d096c62 100644 --- a/plugins/mm-plugin-option.h +++ b/plugins/option/mm-plugin-option.h @@ -11,7 +11,8 @@ * 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_OPTION_H |