diff options
author | Aleksander Morgado <aleksander@aleksander.es> | 2014-10-14 16:34:20 +0200 |
---|---|---|
committer | Aleksander Morgado <aleksander@aleksander.es> | 2014-10-14 16:37:27 +0200 |
commit | 16fb2edd90afc8da3d3f66e1a9f74d4ba43fd251 (patch) | |
tree | f1bba3a63b50d7751000fe6446c48870a93b8a99 | |
parent | 41b7e7b048e67a0b329c820c81beccf42bf0957e (diff) | |
download | ModemManager-16fb2edd90afc8da3d3f66e1a9f74d4ba43fd251.tar.gz |
haier: new Haier plugin to handle port type hints in the CE81Baleksander/haier-plugin
https://bugzilla.gnome.org/show_bug.cgi?id=685011
https://bugs.freedesktop.org/show_bug.cgi?id=85001
-rw-r--r-- | plugins/Makefile.am | 11 | ||||
-rw-r--r-- | plugins/haier/77-mm-haier-port-types.rules | 15 | ||||
-rw-r--r-- | plugins/haier/mm-plugin-haier.c | 105 | ||||
-rw-r--r-- | plugins/haier/mm-plugin-haier.h | 40 |
4 files changed, 170 insertions, 1 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index d2cbcb1cc..271bfe1b4 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -142,7 +142,8 @@ pkglib_LTLIBRARIES = \ libmm-plugin-mbm.la \ libmm-plugin-via.la \ libmm-plugin-telit.la \ - libmm-plugin-mtk.la + libmm-plugin-mtk.la \ + libmm-plugin-haier.la # Generic libmm_plugin_generic_la_SOURCES = \ @@ -511,6 +512,14 @@ libmm_plugin_mtk_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) libmm_plugin_mtk_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) udevrules_DATA += mtk/77-mm-mtk-port-types.rules +# Haier +libmm_plugin_haier_la_SOURCES = \ + haier/mm-plugin-haier.c \ + haier/mm-plugin-haier.h +libmm_plugin_haier_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) +libmm_plugin_haier_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) +udevrules_DATA += haier/77-mm-haier-port-types.rules + # Additional files to include in the distribution EXTRA_DIST += \ diff --git a/plugins/haier/77-mm-haier-port-types.rules b/plugins/haier/77-mm-haier-port-types.rules new file mode 100644 index 000000000..fe77f29b2 --- /dev/null +++ b/plugins/haier/77-mm-haier-port-types.rules @@ -0,0 +1,15 @@ +# do not edit this file, it will be overwritten on update + +ACTION!="add|change|move", GOTO="mm_haier_port_types_end" +SUBSYSTEM!="tty", GOTO="mm_haier_port_types_end" + +SUBSYSTEMS=="usb", ATTRS{idVendor}=="201e", GOTO="mm_haier_port_types_vendorcheck" +GOTO="mm_haier_port_types_end" + +LABEL="mm_haier_port_types_vendorcheck" +SUBSYSTEMS=="usb", ATTRS{bInterfaceNumber}=="?*", ENV{.MM_USBIFNUM}="$attr{bInterfaceNumber}" + +# Haier CE81B +ATTRS{idVendor}=="201e", ATTRS{idProduct}=="10f8", ENV{.MM_USBIFNUM}=="03", ENV{ID_MM_HAIER_MODEM_PORT}="1" + +LABEL="mm_haier_port_types_end" diff --git a/plugins/haier/mm-plugin-haier.c b/plugins/haier/mm-plugin-haier.c new file mode 100644 index 000000000..efdeb9bec --- /dev/null +++ b/plugins/haier/mm-plugin-haier.c @@ -0,0 +1,105 @@ +/* -*- 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) 2014 Aleksander Morgado <aleksander@aleksander.es> + */ + +#include <string.h> +#include <gmodule.h> + +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> + +#include "mm-log.h" +#include "mm-broadband-modem.h" +#include "mm-plugin-haier.h" + +G_DEFINE_TYPE (MMPluginHaier, mm_plugin_haier, MM_TYPE_PLUGIN) + +int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION; +int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION; + +/*****************************************************************************/ + +static MMBaseModem * +create_modem (MMPlugin *self, + const gchar *sysfs_path, + const gchar **drivers, + guint16 vendor, + guint16 product, + GList *probes, + GError **error) +{ + return MM_BASE_MODEM (mm_broadband_modem_new (sysfs_path, + drivers, + mm_plugin_get_name (self), + vendor, + product)); +} + +static gboolean +grab_port (MMPlugin *self, + MMBaseModem *modem, + MMPortProbe *probe, + GError **error) +{ + GUdevDevice *port; + MMPortSerialAtFlag pflags = MM_PORT_SERIAL_AT_FLAG_NONE; + + port = mm_port_probe_peek_port (probe); + + /* Look for port type hints */ + if (mm_port_probe_is_at (probe) && g_udev_device_get_property_as_boolean (port, "ID_MM_HAIER_PORT_TYPE_MODEM")) { + mm_dbg ("HAIER: AT port '%s/%s' flagged as primary", + mm_port_probe_get_port_subsys (probe), + mm_port_probe_get_port_name (probe)); + pflags = (MM_PORT_SERIAL_AT_FLAG_PRIMARY | MM_PORT_SERIAL_AT_FLAG_PPP); + } + + return mm_base_modem_grab_port (modem, + mm_port_probe_get_port_subsys (probe), + mm_port_probe_get_port_name (probe), + mm_port_probe_get_parent_path (probe), + mm_port_probe_get_port_type (probe), + pflags, + error); +} + +/*****************************************************************************/ + +G_MODULE_EXPORT MMPlugin * +mm_plugin_create (void) +{ + static const gchar *subsystems[] = { "tty", NULL }; + static const guint16 vendor_ids[] = { 0x201e, 0 }; + + return MM_PLUGIN (g_object_new (MM_TYPE_PLUGIN_HAIER, + MM_PLUGIN_NAME, "Haier", + MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems, + MM_PLUGIN_ALLOWED_VENDOR_IDS, vendor_ids, + MM_PLUGIN_ALLOWED_AT, TRUE, + NULL)); +} + +static void +mm_plugin_haier_init (MMPluginHaier *self) +{ +} + +static void +mm_plugin_haier_class_init (MMPluginHaierClass *klass) +{ + MMPluginClass *plugin_class = MM_PLUGIN_CLASS (klass); + + plugin_class->create_modem = create_modem; + plugin_class->grab_port = grab_port; +} diff --git a/plugins/haier/mm-plugin-haier.h b/plugins/haier/mm-plugin-haier.h new file mode 100644 index 000000000..e1fdfbb18 --- /dev/null +++ b/plugins/haier/mm-plugin-haier.h @@ -0,0 +1,40 @@ +/* -*- 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) 2014 Aleksander Morgado <aleksander@aleksander.es> + */ + +#ifndef MM_PLUGIN_HAIER_H +#define MM_PLUGIN_HAIER_H + +#include "mm-plugin.h" + +#define MM_TYPE_PLUGIN_HAIER (mm_plugin_haier_get_type ()) +#define MM_PLUGIN_HAIER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_HAIER, MMPluginHaier)) +#define MM_PLUGIN_HAIER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_PLUGIN_HAIER, MMPluginHaierClass)) +#define MM_IS_PLUGIN_HAIER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_HAIER)) +#define MM_IS_PLUGIN_HAIER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_PLUGIN_HAIER)) +#define MM_PLUGIN_HAIER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_PLUGIN_HAIER, MMPluginHaierClass)) + +typedef struct { + MMPlugin parent; +} MMPluginHaier; + +typedef struct { + MMPluginClass parent; +} MMPluginHaierClass; + +GType mm_plugin_haier_get_type (void); + +G_MODULE_EXPORT MMPlugin *mm_plugin_create (void); + +#endif /* MM_PLUGIN_HAIER_H */ |