diff options
| -rw-r--r-- | plugins/Makefile.am | 4 | ||||
| -rw-r--r-- | plugins/x22x/mm-broadband-modem-x22x.c | 60 | ||||
| -rw-r--r-- | plugins/x22x/mm-broadband-modem-x22x.h | 49 | ||||
| -rw-r--r-- | plugins/x22x/mm-plugin-x22x.c | 12 |
4 files changed, 118 insertions, 7 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index b2c8d3fd..eab1660b 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -232,7 +232,9 @@ udevrules_DATA += simtech/77-mm-simtech-port-types.rules # Alcatel/TCT/JRD x220D and possibly others libmm_plugin_x22x_la_SOURCES = \ x22x/mm-plugin-x22x.c \ - x22x/mm-plugin-x22x.h + x22x/mm-plugin-x22x.h \ + x22x/mm-broadband-modem-x22x.h \ + x22x/mm-broadband-modem-x22x.c libmm_plugin_x22x_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) libmm_plugin_x22x_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) udevrules_DATA += x22x/77-mm-x22x-port-types.rules diff --git a/plugins/x22x/mm-broadband-modem-x22x.c b/plugins/x22x/mm-broadband-modem-x22x.c new file mode 100644 index 00000000..22efd6c2 --- /dev/null +++ b/plugins/x22x/mm-broadband-modem-x22x.c @@ -0,0 +1,60 @@ +/* -*- 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-log.h" +#include "mm-errors-types.h" +#include "mm-base-modem-at.h" +#include "mm-broadband-modem-x22x.h" + +G_DEFINE_TYPE (MMBroadbandModemX22x, mm_broadband_modem_x22x, MM_TYPE_BROADBAND_MODEM); + +/*****************************************************************************/ + +MMBroadbandModemX22x * +mm_broadband_modem_x22x_new (const gchar *device, + const gchar *driver, + const gchar *plugin, + guint16 vendor_id, + guint16 product_id) +{ + return g_object_new (MM_TYPE_BROADBAND_MODEM_X22X, + 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_x22x_init (MMBroadbandModemX22x *self) +{ +} + +static void +mm_broadband_modem_x22x_class_init (MMBroadbandModemX22xClass *klass) +{ +} diff --git a/plugins/x22x/mm-broadband-modem-x22x.h b/plugins/x22x/mm-broadband-modem-x22x.h new file mode 100644 index 00000000..aeb9f32b --- /dev/null +++ b/plugins/x22x/mm-broadband-modem-x22x.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_X22X_H +#define MM_BROADBAND_MODEM_X22X_H + +#include "mm-broadband-modem.h" + +#define MM_TYPE_BROADBAND_MODEM_X22X (mm_broadband_modem_x22x_get_type ()) +#define MM_BROADBAND_MODEM_X22X(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_MODEM_X22X, MMBroadbandModemX22x)) +#define MM_BROADBAND_MODEM_X22X_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BROADBAND_MODEM_X22X, MMBroadbandModemX22xClass)) +#define MM_IS_BROADBAND_MODEM_X22X(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_MODEM_X22X)) +#define MM_IS_BROADBAND_MODEM_X22X_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_MODEM_X22X)) +#define MM_BROADBAND_MODEM_X22X_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BROADBAND_MODEM_X22X, MMBroadbandModemX22xClass)) + +typedef struct _MMBroadbandModemX22x MMBroadbandModemX22x; +typedef struct _MMBroadbandModemX22xClass MMBroadbandModemX22xClass; + +struct _MMBroadbandModemX22x { + MMBroadbandModem parent; +}; + +struct _MMBroadbandModemX22xClass{ + MMBroadbandModemClass parent; +}; + +GType mm_broadband_modem_x22x_get_type (void); + +MMBroadbandModemX22x *mm_broadband_modem_x22x_new (const gchar *device, + const gchar *driver, + const gchar *plugin, + guint16 vendor_id, + guint16 product_id); + +#endif /* MM_BROADBAND_MODEM_X22X_H */ diff --git a/plugins/x22x/mm-plugin-x22x.c b/plugins/x22x/mm-plugin-x22x.c index e20e41fc..08a71231 100644 --- a/plugins/x22x/mm-plugin-x22x.c +++ b/plugins/x22x/mm-plugin-x22x.c @@ -23,7 +23,7 @@ #include "mm-log.h" #include "mm-modem-helpers.h" #include "mm-plugin-x22x.h" -#include "mm-broadband-modem.h" +#include "mm-broadband-modem-x22x.h" G_DEFINE_TYPE (MMPluginX22x, mm_plugin_x22x, MM_TYPE_PLUGIN) @@ -186,11 +186,11 @@ create_modem (MMPlugin *self, GList *probes, GError **error) { - return MM_BASE_MODEM (mm_broadband_modem_new (sysfs_path, - driver, - mm_plugin_get_name (self), - vendor, - product)); + return MM_BASE_MODEM (mm_broadband_modem_x22x_new (sysfs_path, + driver, + mm_plugin_get_name (self), + vendor, + product)); } static gboolean |